| commit | fe7e9c23e4ef183eaff5256a7ce681296f3a92f6 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:19:41 +0000 (11 23:19 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:32 +0000 (14 14:19 -0700) | ||
| tree | b0b84d0ac3d020321eb58ce5528b4ab99e6e532b | treesnapshot (tar.gz zip) |
| parent | c6966068fb4d2a2daa130202eeabfd2f08b51fa5 | commitdiff |
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>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6036-recursive-corner-cases.sh | diffblobblamehistory |