projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 827f2b7) | patch
t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:44 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:33 +0000 (14:19 -0700)
commita0d3311624638bf3043f2c442e698b14c5fb2d02
tree40099aee97c51da3ac3631bf67b752f6160e3f31tree | snapshot
parent827f2b7d297dfbe20809c0be600827834c2c3992commit | diff
t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify

This test is mostly just designed for testing optimality of the virtual
merge base in the event of a rename/rename(1to2) conflict.  The current
choice for resolving this in git seems somewhat confusing and suboptimal.

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