diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:32:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:32:56 -0700 |
| commit | 2149e0f6a66cb4a5707ef6201763051d94f288af (patch) | |
| tree | f5bebcfe1204bd161cffe277c1e8dc0194e21066 /contrib/difftool | |
| parent | Merge branch 'mh/html-path' (diff) | |
| parent | simplify output of conflicting merge (diff) | |
| download | tgif-2149e0f6a66cb4a5707ef6201763051d94f288af.tar.xz | |
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 'contrib/difftool')
0 files changed, 0 insertions, 0 deletions