diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:45 -0700 |
| commit | e6da45c7cd40afcd8dc8462fc714532ec6d673f6 (patch) | |
| tree | 9c5af890c193984af147cbeb8a8ca23d3ab7b43e /tmp-objdir.h | |
| parent | Merge branch 'en/dirty-merge-fixes' (diff) | |
| parent | t6036: add a failed conflict detection case: regular files, different modes (diff) | |
| download | tgif-e6da45c7cd40afcd8dc8462fc714532ec6d673f6.tar.xz | |
Merge branch 'en/t6036-merge-recursive-tests'
Tests to cover various conflicting cases have been added for
merge-recursive.
* en/t6036-merge-recursive-tests:
t6036: add a failed conflict detection case: regular files, different modes
t6036: add a failed conflict detection case with conflicting types
t6036: add a failed conflict detection case with submodule add/add
t6036: add a failed conflict detection case with submodule modify/modify
t6036: add a failed conflict detection case with symlink add/add
t6036: add a failed conflict detection case with symlink modify/modify
Diffstat (limited to 'tmp-objdir.h')
0 files changed, 0 insertions, 0 deletions