Merge branch 'en/abort-df-conflict-fixes'

diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh
index 7a48236e87695d947c7c3f166e1d291cd3b7a05b..9b2a274c71f40ace060069212055a29f9a3c4203 100755 (executable)
--- a/t/t5407-post-rewrite-hook.sh
+++ b/t/t5407-post-rewrite-hook.sh
@@ -113,7 +113,7 @@ test_expect_success 'git rebase -m' '
 test_expect_success 'git rebase -m --skip' '
        git reset --hard D &&
        clear_hook_input &&
-       test_must_fail git rebase --onto A B &&
+       test_must_fail git rebase -m --onto A B &&
        test_must_fail git rebase --skip &&
        echo D > foo &&
        git add foo &&