diff options
Diffstat (limited to 'third_party/git/t/t3035-merge-sparse.sh')
| -rwxr-xr-x | third_party/git/t/t3035-merge-sparse.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/git/t/t3035-merge-sparse.sh b/third_party/git/t/t3035-merge-sparse.sh index 74562e123566..c4b4a94324a2 100755 --- a/third_party/git/t/t3035-merge-sparse.sh +++ b/third_party/git/t/t3035-merge-sparse.sh @@ -28,7 +28,7 @@ test_expect_success 'setup' ' git config core.sparseCheckout true && echo "/checked-out" >.git/info/sparse-checkout && git reset --hard && - test_must_fail git merge theirs + ! git merge theirs ' test_expect_success 'reset --hard works after the conflict' ' @@ -42,7 +42,7 @@ test_expect_success 'is reset properly' ' ' test_expect_success 'setup: conflict back' ' - test_must_fail git merge theirs + ! git merge theirs ' test_expect_success 'Merge abort works after the conflict' ' |