![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Oct 2011 17:48:38 +0000 (10:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Oct 2011 17:48:38 +0000 (10:48 -0700) |
* bk/submodule-in-recursive-merge:
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge
Trivial merge