diff options
Diffstat (limited to 't/t7501-commit.sh')
| -rwxr-xr-x | t/t7501-commit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 363abb187e..cb6c5bdcb6 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -600,7 +600,7 @@ test_expect_success '--dry-run with conflicts fixed from a merge' ' git checkout -b branch-2 HEAD^1 && echo "commit-2-state" >test-file && git commit -m "commit 2" -i test-file && - ! $(git merge --no-commit commit-1) && + test_must_fail git merge --no-commit commit-1 && echo "commit-2-state" >test-file && git add test-file && git commit --dry-run && |