]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e05aae6 bf74106)
Merge branch 'do/maint-merge-recursive-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:50 +0000 (01:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:39:50 +0000 (01:39 -0700)
* do/maint-merge-recursive-fix:
  merge-recursive: never leave index unmerged while recursing

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

diff --cc merge-recursive.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.