![[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) | ||
| commit | eb8a1c4aed2728e1be1c5e39fb9e5a3f4b209fc4 | |
| tree | b20cc784a712eb89f3f1392950472f95ed245966 | tree | snapshot |
| parent | 2aa3140bc07d7b593efe2d963d8d9b0a9a0cbf05 | commit | diff |
| parent | 39d8e271f42e976a61f08a4f7bc2047a682ac532 | commit | diff |
Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint
* 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