| commit | e6da45c7cd40afcd8dc8462fc714532ec6d673f6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Aug 2018 22:30:45 +0000 (2 15:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Aug 2018 22:30:45 +0000 (2 15:30 -0700) | ||
| tree | 9c5af890c193984af147cbeb8a8ca23d3ab7b43e | treesnapshot (tar.gz zip) |
| parent | c18ac30e9ebcf7b7e2fbd992744e63c71089a12a | commitdiff |
| parent | 5d1daf30cce5744b219002e0a6da015a13216cd1 | commitdiff |
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
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
| t/t6036-recursive-corner-cases.sh | diff1 | diff2 | blobhistory |