On Sat, Mar 28, 2009 at 11:19:31AM -0500, Michael Johnson <redbeard@xxxxxxxxxxxx> wrote: > The 1.6.2.1 version just segfaults, but 1.5.6.5 says: > > /usr/bin/git-merge: line 438: 32335 Segmentation fault > git-merge-$strategy $common -- "$head_arg" "$@" > Merge with strategy recursive failed. > > In all cases, .git/index.lock is left behind. That's because 1.6.2.1 has git-merge in C and it calls merge-recursive directly without a fork. Could you try it in gdb and provide a backtrace, please?
Attachment:
pgpkiXHYtenom.pgp
Description: PGP signature
