Merge branch 'jc/checkout-m-twoway'

* jc/checkout-m-twoway: t/t2023-checkout-m.sh: fix use of test_must_fail
13 years ago · 1b048b197d
1 changed files with 3 additions and 1 deletions
--- a/t/t2023-checkout-m.sh
+++ b/t/t2023-checkout-m.sh
@ -17,7 +17,9 @@ test_expect_success setup '
				@@ -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