projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3ebb17 c94736a)
Merge branch 'jc/maint-merge-recursive-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2009 18:34:24 +0000 (11:34 -0700)
* jc/maint-merge-recursive-fix:
  merge-recursive: don't segfault while handling rename clashes

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Git—the stupid content tracker