Merge branch 'jc/checkout-m-twoway'

* jc/checkout-m-twoway:
t/t2023-checkout-m.sh: fix use of test_must_fail

diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh
index 1a40ce02e5d03abab92be5d167f5b92f1c86125d..7e189851348d571b2e654325ba38e7564d0bc950 100755 (executable)
--- a/t/t2023-checkout-m.sh
+++ b/t/t2023-checkout-m.sh
@@ -17,7 +17,9 @@ test_expect_success setup '
        test_commit added_in_topic each.txt in_topic
 '
 
-test_must_fail git merge master
+test_expect_success 'git merge master' '
+    test_must_fail git merge master
+'
 
 clean_branchnames () {
        # Remove branch names after conflict lines