t7600: fix typo in test title
Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a54841e96b
commit
6d2d43dc9d
@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' '
|
|||||||
test_must_fail git merge --no-ff --ff-only c2
|
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 &&
|
git reset --hard c0 &&
|
||||||
test_config merge.ff only &&
|
test_config merge.ff only &&
|
||||||
git merge --no-ff c1
|
git merge --no-ff c1
|
||||||
|
Loading…
Reference in New Issue
Block a user