Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cb/maint-merge-recursive-submodule-fix'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 8 Apr 2009 05:32:56 +0000
(22:32 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 8 Apr 2009 05:32:56 +0000
(22:32 -0700)
* cb/maint-merge-recursive-submodule-fix:
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules
1
2
merge-recursive.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
d65279d
39d8e27
)
diff --cc
merge-recursive.c
Simple merge