Andrew's git / gitweb.git / diff
?
Merge branch 'en/t6042-insane-merge-rename-testcases'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:42 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:43 +0000 (15:30 -0700)
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

1  2 
t/t6042-merge-rename-corner-cases.sh patch | diff1 | diff2 | blob | history
diff --cc t/t6042-merge-rename-corner-cases.sh
Simple merge