summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-23 10:09:49 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-23 10:09:49 -0700
commit9ae54a1ddebbbc8f3f12116f3ad9fd6dcf74bf02 (patch)
tree8e54067d63efd990fea605b463a558801c8f4ab5 /t
parent0bde8c0c1e53e2b2001f4ced58d3e66865758cea (diff)
parent6d2d43dc9d98ffc385066fbb46c587b6426bf0ac (diff)
downloadgit-9ae54a1ddebbbc8f3f12116f3ad9fd6dcf74bf02.tar.gz
Merge branch 'mv/merge-ff-tristate'
* mv/merge-ff-tristate: t7600: fix typo in test title
Diffstat (limited to 't')
-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 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