t6036: tests for criss-cross merges with various directory/file conflicts
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:43 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:32 +0000 (14:19 -0700)
commit827f2b7...297dfbe20809c0be600827834c2c3992
tree11eb399...0f71ff8e416ac87d764ed3de6c77def3copy hash to clipboard (tree)
parent96b079e...c94b6881335ab1cd9a3d88ee877da96ecopy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh