![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) | ||
| commit | 2149e0f6a66cb4a5707ef6201763051d94f288af | |
| tree | f5bebcfe1204bd161cffe277c1e8dc0194e21066 | tree | snapshot |
| parent | d65279d5bf02f3c457a843c8586752714f42e75a | commit | diff |
| parent | 39d8e271f42e976a61f08a4f7bc2047a682ac532 | commit | diff |
Merge branch 'cb/maint-merge-recursive-submodule-fix'
* 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 | | blob | history |