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 ed6c6f45d6..279f33ca2d 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -496,7 +496,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict git tag E2 ' -test_expect_failure 'merge of D & E1 fails but has appropriate contents' ' +test_expect_success 'merge of D & E1 fails but has appropriate contents' ' get_clean_checkout D^0 && test_must_fail git merge -s recursive E1^0 && |