diff options
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 e9c7a25e19..dfee7d159b 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 && |