projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c696606) | patch
t6036: Add differently resolved modify/delete conflict in criss-cross test
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:41 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:32 +0000 (14:19 -0700)
commitfe7e9c23e4ef183eaff5256a7ce681296f3a92f6
treeb0b84d0ac3d020321eb58ce5528b4ab99e6e532btree | snapshot
parentc6966068fb4d2a2daa130202eeabfd2f08b51fa5commit | diff
t6036: Add differently resolved modify/delete conflict in criss-cross test

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