diff options
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 4f9e7f7ff6..2f86fca042 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -297,7 +297,7 @@ test_expect_success '--rebase (merge) fast forward' ' test_expect_success '--rebase (am) fast forward' ' git reset --hard before-rebase && - git -c rebase.backend=am pull --rebase . ff && + git -c rebase.backend=apply pull --rebase . ff && test_cmp_rev HEAD ff && # The above only validates the result. Did we actually bypass rebase? |