]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'do/maint-merge-recursive-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:43 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:43 +0000 (19:03 -0700)
* do/maint-merge-recursive-fix:
  merge-recursive: never leave index unmerged while recursing

1  2 
merge-recursive.c

Simple merge