From: Junio C Hamano Date: Tue, 23 Jul 2013 17:08:40 +0000 (-0700) Subject: t7600: fix typo in test title X-Git-Tag: v1.8.4-rc0~15^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d2d43dc9d98ffc385066fbb46c587b6426bf0ac;p=git t7600: fix typo in test title Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano --- 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