t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
authorElijah Newren <newren@gmail.com>
Mon, 2 Jul 2018 13:30:53 +0000 (06:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2018 21:47:44 +0000 (14:47 -0700)
commiteee7338...f25a7a0c61b2200868d93ff8d91b27ca
tree0a5dff4...2eeef6587d086f82340013537d7c94decopy hash to clipboard (tree)
parent11d9ade...0e50848b10107d281fcfafb785bfb112copy hash to clipboard (diff)
t/t6042-merge-rename-corner-cases.sh