diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 6c2b2bfa67..a2e5c5c08f 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -120,7 +120,7 @@ test_expect_success 'setup criss-cross + rename merges with basic modification' git tag R2 ' -test_expect_failure 'merge criss-cross + rename merges with basic modification' ' +test_expect_success 'merge criss-cross + rename merges with basic modification' ' git reset --hard && git checkout L2^0 && @@ -202,7 +202,7 @@ test_expect_success 'setup differently handled merges of rename/add conflict' ' git tag E ' -test_expect_failure 'git detects differently handled merges conflict' ' +test_expect_success 'git detects differently handled merges conflict' ' git reset --hard && git checkout D^0 && |