diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:45 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | 583942df098b04f545fb6bbe7b0d1590cc7b7b1d (patch) | |
| tree | 6dede22d80e0995405f9a25978cf8fa89d9cd88f /t/t9603/cvsroot/module | |
| parent | t6036: Test index and worktree state, not just that merge fails (diff) | |
| download | tgif-583942df098b04f545fb6bbe7b0d1590cc7b7b1d.tar.xz | |
t6036: Add a second testcase similar to the first but with content changes
c94736a (merge-recursive: don't segfault while handling rename clashes
2009-07-30) added t6036 with a testcase that involved dual renames and a
criss-cross merge. Add a test that is nearly identical, but which also
involves content modification -- a case git currently does not merge
correctly.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9603/cvsroot/module')
0 files changed, 0 insertions, 0 deletions