Merge branch 'jc/checkout-m-twoway'

* jc/checkout-m-twoway: t/t2023-checkout-m.sh: fix use of test_must_fail
git-mirror · Dec 20, 2011 · 1b048b1 · 1b048b1
2 parents 3fabe99 + 5cd7fad
commit 1b048b1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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