Merge branch 'mv/merge-ff-tristate'

gitster · gitster · commit 9ae54a1ddebb · 2013-07-23T10:09:49.000-07:00
* mv/merge-ff-tristate:
  t7600: fix typo in test title
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
@@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' '
 	test_must_fail git merge --no-ff --ff-only c2
 '
 
-test_expect_success 'option --ff-only overwrites merge.ff=only config' '
+test_expect_success 'option --no-ff overrides merge.ff=only config' '
 	git reset --hard c0 &&
 	test_config merge.ff only &&
 	git merge --no-ff c1

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' '`
`502`	`502`	`test_must_fail git merge --no-ff --ff-only c2`
`503`	`503`	`'`
`504`	`504`
`505`		`-test_expect_success 'option --ff-only overwrites merge.ff=only config' '`
	`505`	`+test_expect_success 'option --no-ff overrides merge.ff=only config' '`
`506`	`506`	`git reset --hard c0 &&`
`507`	`507`	`test_config merge.ff only &&`
`508`	`508`	`git merge --no-ff c1`