t7600: fix typo in test title
Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 23, 2013 at 10:08 UTC
6d2d43dc9d98ffc385066fbb46c587b6426bf0ac
1 file changed
+1
-1
t/t7600-merge.sh
+1
-1
@@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' '
502
test_must_fail git merge --no-ff --ff-only c2
503
'
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
git reset --hard c0 &&
507
test_config merge.ff only &&
508
git merge --no-ff c1