![[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) | ||
| commit | 2201cc8c977918c520e70093f4b74bbdf70afcc5 | |
| tree | fb02d2b778207f6d4e91940e1e568031b8cb9698 | tree | snapshot |
| parent | c31b87d111f6df359255979ea94e8648a51c3647 | commit | diff |
| parent | 80988783c8c417c5e914256b43ed3604cc8fa4c3 | commit | diff |
Merge branch 'bk/submodule-in-recursive-merge'
* bk/submodule-in-recursive-merge:
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge
* bk/submodule-in-recursive-merge:
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge