projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 35a74ab) | patch
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:28 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:40 +0000 (14:19 -0700)
commitb630b8147055a6fd56edfdf3ba85e9dea27dd397
tree1115f65a8a2375fe1c0f3c707cfb2306478dc256tree | snapshot
parent35a74abff32c32c455a74974130ad2af7d81dfd9commit | diff
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>
t/t6036-recursive-corner-cases.sh diff | blob | history
Git—the stupid content tracker