X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7610-mergetool.sh;h=09fa5f115c9fabe1fec60a5597439b2c7f9ded6d;hb=5bdd8d4a3062ac8f29ec511fecb85049f6ff3ecc;hp=6b0483f3e9b77e0bdc42b0c7421db6c60868cf5d;hpb=17d778e710f9dacc770b5790e792b85cdba75a9d;p=git.git

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 6b0483f3e..09fa5f115 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Charles Bailey
 #
 
-test_description='git-mergetool
+test_description='git mergetool
 
 Testing basic merge tool invocation'
 
@@ -35,7 +35,7 @@ test_expect_success 'custom mergetool' '
     git config mergetool.mytool.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
     git config mergetool.mytool.trustExitCode true &&
 	git checkout branch1 &&
-    ! git merge master >/dev/null 2>&1 &&
+    test_must_fail git merge master >/dev/null 2>&1 &&
     ( yes "" | git mergetool file1>/dev/null 2>&1 ) &&
     ( yes "" | git mergetool file2>/dev/null 2>&1 ) &&
     test "$(cat file1)" = "master updated" &&