Merge branch 'jc/checkout-m-twoway'

gitster · gitster · commit 1b048b197d6c · 2011-12-20T13:24:08.000-08:00
* 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,9 @@ test_expect_success setup '`
`17`	`17`	`test_commit added_in_topic each.txt in_topic`
`18`	`18`	`'`
`19`	`19`
`20`		`-test_must_fail git merge master`
	`20`	`+test_expect_success 'git merge master' '`
	`21`	`+ test_must_fail git merge master`
	`22`	`+'`
`21`	`23`
`22`	`24`	`clean_branchnames () {`
`23`	`25`	`# Remove branch names after conflict lines`