diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:42 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:32 -0700 |
| commit | 96b079e5c94b6881335ab1cd9a3d88ee877da96e (patch) | |
| tree | 062759df473d1b616f0ec36e59cb2ec1a5fef798 /t/t9121 | |
| parent | t6036: Add differently resolved modify/delete conflict in criss-cross test (diff) | |
| download | tgif-96b079e5c94b6881335ab1cd9a3d88ee877da96e.tar.xz | |
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>
Diffstat (limited to 't/t9121')
0 files changed, 0 insertions, 0 deletions