t6042: Add tests for content issues with modify/rename/directory conflicts
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:38 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:31 +0000 (14:19 -0700)
commitac6e839...41009459b46e860f9d7fc524bb9ecc0b
treea1671f1...f8d2d2e5b921943f62b89c3ed0306f25copy hash to clipboard (tree)
parenta0551f2...2edd13e3df0d3dcd5abf148e0f003e59copy hash to clipboard (diff)
t/t6042-merge-rename-corner-cases.sh