Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'do/maint-merge-recursive-fix'
author
Junio C Hamano
<gitster@pobox.com>
Sat, 23 May 2009 08:39:50 +0000
(
01:39
-0700)
committer
Junio 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
raw
|
combined
(merge:
e05aae6
bf74106
)
diff --cc
merge-recursive.c
Simple merge