diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:28 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:40 -0700 |
| commit | b630b8147055a6fd56edfdf3ba85e9dea27dd397 (patch) | |
| tree | 1115f65a8a2375fe1c0f3c707cfb2306478dc256 /merge-recursive.c | |
| parent | 35a74abff32c32c455a74974130ad2af7d81dfd9 (diff) | |
| download | git-b630b8147055a6fd56edfdf3ba85e9dea27dd397.tar.gz | |
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
This is another testcase trying to exercise the virtual merge base
creation in the rename/rename(1to2) code. A testcase is added that we
should be able to merge cleanly, but which requires a virtual merge base
to be created that correctly handles rename/add-dest conflicts within the
rename/rename(1to2) testcase handling.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions