merge: refuse --commit with --squash

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index f84ff941c3624be821fd87a67922ad1d2ca00b34..55835ee4a47158e1f7aeaa9aeb393f1f3d619791 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -802,7 +802,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
        test_must_fail git bisect terms only-one &&
        test_must_fail git bisect terms 1 2 &&
        test_must_fail git bisect terms 2>actual &&
-       echo "no terms defined" >expected &&
+       echo "error: no terms defined" >expected &&
        test_i18ncmp expected actual
 '