![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Apr 2009 21:18:25 +0000 (14:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Apr 2009 21:18:25 +0000 (14:18 -0700) |
* cb/maint-merge-recursive-submodule-fix:
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules
Trivial merge