| commit | 309e1a32aaa58f95fcde668197b1da87629244f1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Apr 2009 07:02:38 +0000 (6 00:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Apr 2009 07:02:38 +0000 (6 00:02 -0700) | ||
| tree | 1dd821d67e9a2d4c97d0b6e0bfd292876a0c436a | treesnapshot (tar.gz zip) |
| parent | 2b968e11837198e1517ad8626e8f5a3bc7119d15 | commitdiff |
| parent | 39d8e271f42e976a61f08a4f7bc2047a682ac532 | commitdiff |
Merge branch 'cb/maint-merge-recursive-submodule-fix' into next
* cb/maint-merge-recursive-submodule-fix:
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules
* cb/maint-merge-recursive-submodule-fix:
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules
| merge-recursive.c | diff1 | diff2 | blobhistory |