Merge branch 'sg/t7501-thinkofix'

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index fb9337c708798edd411802251fa4b9cd39387140..4cae92804d11f75f24bdd6f6517a88c834e7cfc7 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -675,7 +675,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 &&