projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 96b079e) | patch
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)
commit827f2b7d297dfbe20809c0be600827834c2c3992
tree11eb399e0f71ff8e416ac87d764ed3de6c77def3tree | snapshot
parent96b079e5c94b6881335ab1cd9a3d88ee877da96ecommit | diff
t6036: tests for criss-cross merges with various directory/file conflicts

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh diff | blob | history
Git—the stupid content tracker