On Mon, Jan 9, 2012 at 12:09 PM, jjacky <[email protected]> wrote: > the entry's name is only used when not "." or ".." so > only print the string then. (i'm guessing enormous > speed improvements right there... :p) > > Signed-off-by: Olivier Brunel <[email protected]> > ---
$ git am -3 -s < /tmp/rmrf-libalpm.patch Applying: Only create string when needed (libalpm) fatal: corrupt patch at line 12 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Only create string when needed (libalpm) I can't apply this or the other one, because you've gummed up all the formatting. If you aren't using git-send-email, you probably should be, as all tabs got converted to spaces. Please resend your patches correctly, thanks! -Dan
