aboutsummaryrefslogtreecommitdiff
path: root/t/t1200-tutorial.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t1200-tutorial.sh')
-rwxr-xr-xt/t1200-tutorial.sh2
1 files changed, 1 insertions, 1 deletions
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