diff options
Diffstat (limited to 't/t7601-merge-pull-config.sh')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 7fd8c086af..c83298ba68 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -281,7 +281,7 @@ test_expect_success '--rebase overrides pull.ff unset' ' test_does_rebase pull --rebase ' -# Group 4: --no-rebase heeds pull.ff=!only or explict --ff or --no-ff +# Group 4: --no-rebase heeds pull.ff=!only or explicit --ff or --no-ff test_expect_success '--no-rebase works with --no-ff' ' test_does_merge_when_ff_possible pull --no-rebase --no-ff |