From 6d2d43dc9d98ffc385066fbb46c587b6426bf0ac Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 23 Jul 2013 10:08:40 -0700 Subject: [PATCH] t7600: fix typo in test title Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano --- t/t7600-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 3ff5fb853c..10aa028017 100755 --- 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