| commit | a0d3311624638bf3043f2c442e698b14c5fb2d02 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:19:44 +0000 (11 23:19 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:33 +0000 (14 14:19 -0700) | ||
| tree | 40099aee97c51da3ac3631bf67b752f6160e3f31 | treesnapshot (tar.gz zip) |
| parent | 827f2b7d297dfbe20809c0be600827834c2c3992 | commitdiff |
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>
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 | diffblobblamehistory |