![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:19:43 +0000 (23:19 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:32 +0000 (14:19 -0700) | ||
| commit | 827f2b7d297dfbe20809c0be600827834c2c3992 | |
| tree | 11eb399e0f71ff8e416ac87d764ed3de6c77def3 | tree | snapshot |
| parent | 96b079e5c94b6881335ab1cd9a3d88ee877da96e | commit | 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>
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 |