diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-12 05:20:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 21:19:40 (GMT) |
| commit | 6d63070cacf88cd03b4bc73fd64fea046accd450 (patch) | |
| tree | 812502fc3d4ec37dc712937ae9898b18e1e2b901 /t/t6036-recursive-corner-cases.sh | |
| parent | b630b8147055a6fd56edfdf3ba85e9dea27dd397 (diff) | |
| download | git-6d63070cacf88cd03b4bc73fd64fea046accd450.zip git-6d63070cacf88cd03b4bc73fd64fea046accd450.tar.gz git-6d63070cacf88cd03b4bc73fd64fea046accd450.tar.bz2 | |
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
Earlier in this series, the patch "merge-recursive: add handling for
rename/rename/add-dest/add-dest" added code to handle the rename on each
side of history also being involved in a rename/add conflict, but only
did so in the non-recursive case. Add code for the recursive case,
ensuring that the "added" files are not simply deleted.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index e9c7a25..dfee7d1 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -760,7 +760,7 @@ test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' ' git tag E ' -test_expect_failure 'virtual merge base handles rename/rename(1to2)/add-dest' ' +test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' ' git checkout D^0 && git merge -s recursive E^0 && |