| commit | 84e74c64034dafe96edfb7a1f7272daa9149c1e3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Aug 2018 22:30:42 +0000 (2 15:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Aug 2018 22:30:43 +0000 (2 15:30 -0700) | ||
| tree | 70bff94c286a467fbef66065c27e2bb72c72f290 | treesnapshot (tar.gz zip) |
| parent | 3a2a1dc17077a27ad1a89db27cb1b4b374f3b0ff | commitdiff |
| parent | 651f7f3a1b15beec5319ea95b91a7461c805f37b | commitdiff |
Merge branch 'en/t6042-insane-merge-rename-testcases'
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
* en/t6042-insane-merge-rename-testcases:
t6042: add testcase covering long chains of rename conflicts
t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
t6042: add testcase covering rename/add/delete conflict type
Various glitches in the heuristics of merge-recursive strategy have
been documented in new tests.
* en/t6042-insane-merge-rename-testcases:
t6042: add testcase covering long chains of rename conflicts
t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
t6042: add testcase covering rename/add/delete conflict type
| t/t6042-merge-rename-corner-cases.sh | diff1 | diff2 | blobhistory |