X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=09a8199335cbdf96f8aba75d47a321f0cfb828d9;hb=d6096f17d2d5d9ccb453aabf8edc6ee238b166fc;hp=dcb3108c290813dae178394011bb2b44f2f7ca9e;hpb=a473445ac256f4a6ca5c66f83f33b85eec0e0c48;p=git.git

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index dcb3108c2..09a819933 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -102,7 +102,7 @@ echo "Lots of fun" >>example
 git commit -m 'Some fun.' -i hello example
 
 test_expect_success 'git resolve now fails' '
-	! git merge -m "Merge work in mybranch" mybranch
+	test_must_fail git merge -m "Merge work in mybranch" mybranch
 '
 
 cat > hello << EOF