diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-08 09:32:56 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 09:32:56 +0400 |
| commit | 2149e0f6a66cb4a5707ef6201763051d94f288af (patch) | |
| tree | f5bebcfe1204bd161cffe277c1e8dc0194e21066 /builtin-checkout.c | |
| parent | d65279d5bf02f3c457a843c8586752714f42e75a (diff) | |
| parent | 39d8e271f42e976a61f08a4f7bc2047a682ac532 (diff) | |
Merge branch 'cb/maint-merge-recursive-submodule-fix'
* cb/maint-merge-recursive-submodule-fix:
simplify output of conflicting merge
update cache for conflicting submodule entries
add tests for merging with submodules
Diffstat (limited to 'builtin-checkout.c')
0 files changed, 0 insertions, 0 deletions