t6042: add testcase covering rename/add/delete conflict type
authorElijah Newren <newren@gmail.com>
Mon, 2 Jul 2018 13:30:52 +0000 (06:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2018 21:47:42 +0000 (14:47 -0700)
commit11d9ade...0e50848b10107d281fcfafb785bfb112
treec2f12ee...339418770c0b5cddf8f69268f7e619b9copy hash to clipboard (tree)
parente333175...f12da22f4103eec7efe1b5304a9be5e9copy hash to clipboard (diff)
t/t6042-merge-rename-corner-cases.sh