diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-23 21:09:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-23 21:09:49 +0400 |
| commit | 9ae54a1ddebbbc8f3f12116f3ad9fd6dcf74bf02 (patch) | |
| tree | 8e54067d63efd990fea605b463a558801c8f4ab5 | |
| parent | 0bde8c0c1e53e2b2001f4ced58d3e66865758cea (diff) | |
| parent | 6d2d43dc9d98ffc385066fbb46c587b6426bf0ac (diff) | |
Merge branch 'mv/merge-ff-tristate'
* mv/merge-ff-tristate:
t7600: fix typo in test title
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
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 |