Merge branch 'pb/test-must-fail-is-for-git'

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 63d36fb28e44426708a743979c4bc341bdac714e..0fe7e58cfbcfcf42b53389df772815378bccc8f2 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -602,7 +602,7 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
        test_config mergetool.myecho.trustExitCode true &&
        test_must_fail git merge master &&
        git mergetool --no-prompt --tool myecho -- both >actual &&
-       test_must_fail grep ^\./both_LOCAL_ actual >/dev/null &&
+       ! grep ^\./both_LOCAL_ actual >/dev/null &&
        grep /both_LOCAL_ actual >/dev/null &&
        git reset --hard master >/dev/null 2>&1
 '