git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a0d3311)
t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
authorElijah Newren <redacted>
Fri, 12 Aug 2011 05:19:45 +0000 (23:19 -0600)
committerJunio C Hamano <redacted>
Sun, 14 Aug 2011 21:19:33 +0000 (14:19 -0700)
commit0b35deb378ee471f64e1b376d722e0bdd97d5e36
treea2789d93714c73467ef0f4ea7ecca197f9161031tree | snapshot
parenta0d3311624638bf3043f2c442e698b14c5fb2d02commit | diff
t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify

This is another challenging 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 is aware of rename/rename(1to2)/add-source
conflicts and can handle those.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t6036-recursive-corner-cases.sh diff | blob | history
git clone https://git.99rst.org/PROJECT