summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-23 17:08:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-23 17:08:40 (GMT)
commit6d2d43dc9d98ffc385066fbb46c587b6426bf0ac (patch)
tree5e675a04666457297559c1d6a268e2cec5943105 /t/t7600-merge.sh
parenta54841e96b78203598dea6b31b9618f40f107e7b (diff)
downloadgit-6d2d43dc9d98ffc385066fbb46c587b6426bf0ac.zip
git-6d2d43dc9d98ffc385066fbb46c587b6426bf0ac.tar.gz
git-6d2d43dc9d98ffc385066fbb46c587b6426bf0ac.tar.bz2
t7600: fix typo in test title
Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 3ff5fb8..10aa028 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