t6042: Add failing testcase for rename/modify/add-source conflict
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:35 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:31 +0000 (14:19 -0700)
commit5804023...f59004f71d9ae70d0fcd9e0d4f6a3259
tree0dee948...e35f2d2e9fd75d0532c83c29faf658dbcopy hash to clipboard (tree)
parent695576f...dd039b2fdc3cad52bbaab4d89e27b71ccopy hash to clipboard (diff)
t/t6042-merge-rename-corner-cases.sh