| commit | e02205c4899dcef9d4a80ca0f7d2fd9d33b74b1e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Oct 2011 04:25:40 +0000 (15 21:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 16 Oct 2011 04:25:40 +0000 (15 21:25 -0700) | ||
| tree | c947a195e42aca324f635fe385971bbc8e47abbf | treesnapshot (tar.gz zip) |
| parent | 8e89bc53871b3c02a7d4e1087624b32a43911200 | commitdiff |
| parent | 80988783c8c417c5e914256b43ed3604cc8fa4c3 | commitdiff |
Merge branch 'bk/submodule-in-recursive-merge' into next
* 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