merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

[thirdparty/git.git] / t / t6036-recursive-corner-cases.sh

diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index e9c7a25e19456a607029ea7595041cc98d2f9a87..dfee7d159b3b5198b4773f2d3869e809095b11f7 100755 (executable)
--- 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 &&