diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 05:19:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 21:19:33 (GMT) |
| commit | 0b35deb378ee471f64e1b376d722e0bdd97d5e36 (patch) | |
| tree | a2789d93714c73467ef0f4ea7ecca197f9161031 /t/t6022-merge-rename.sh | |
| parent | a0d3311624638bf3043f2c442e698b14c5fb2d02 (diff) | |
| download | git-0b35deb378ee471f64e1b376d722e0bdd97d5e36.zip git-0b35deb378ee471f64e1b376d722e0bdd97d5e36.tar.gz git-0b35deb378ee471f64e1b376d722e0bdd97d5e36.tar.bz2 | |
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions