Code

t6036: criss-cross with weird content can fool git into clean merge
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:42 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:32 +0000 (14:19 -0700)
commit96b079e5c94b6881335ab1cd9a3d88ee877da96e
tree062759df473d1b616f0ec36e59cb2ec1a5fef798
parentfe7e9c23e4ef183eaff5256a7ce681296f3a92f6
t6036: criss-cross with weird content can fool git into clean merge

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh