From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:42 +0000 (-0700)
Subject: Merge branch 'en/t6042-insane-merge-rename-testcases'
X-Git-Tag: v2.19.0-rc0~103
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/84e74c64034dafe96edfb7a1f7272daa9149c1e3

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
---

84e74c64034dafe96edfb7a1f7272daa9149c1e3