diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:44 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:33 -0700 |
| commit | a0d3311624638bf3043f2c442e698b14c5fb2d02 (patch) | |
| tree | 40099aee97c51da3ac3631bf67b752f6160e3f31 /Documentation/gitcli.txt | |
| parent | t6036: tests for criss-cross merges with various directory/file conflicts (diff) | |
| download | tgif-a0d3311624638bf3043f2c442e698b14c5fb2d02.tar.xz | |
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>
Diffstat (limited to 'Documentation/gitcli.txt')
0 files changed, 0 insertions, 0 deletions