diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-23 10:08:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-23 10:08:40 -0700 |
| commit | 6d2d43dc9d98ffc385066fbb46c587b6426bf0ac (patch) | |
| tree | 5e675a04666457297559c1d6a268e2cec5943105 /t | |
| parent | a54841e96b78203598dea6b31b9618f40f107e7b (diff) | |
| download | git-6d2d43dc9d98ffc385066fbb46c587b6426bf0ac.tar.gz | |
t7600: fix typo in test titlemv/merge-ff-tristate
Spotted by Ram, confirmed by Miklos.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -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 |