mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mv/merge-ff-tristate'

Browse Source 
* mv/merge-ff-tristate:
  t7600: fix typo in test title
This commit is contained in:
Junio C Hamano
2013-07-23 10:09:49 -07:00
parent 0bde8c0c1e 6d2d43dc9d
commit 9ae54a1dde
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7600-merge.sh
View File

@ -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