diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index dbc90bc41625fccb4119cd6c2fc49668fe784122..6a2b12558a85db2d522b3cc6047b1d5b1b7fb327 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
test_must_fail git merge
'
+test_expect_success 'reject non-strategy with a git-merge-foo name' '
+ test_must_fail git merge -s index c1
+'
+
test_expect_success 'merge c0 with c1' '
git reset --hard c0 &&
git merge c1 &&