am: support --patch-format=mboxrd

diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 1e9d1a737c5369d1b41bfa75f5939ad41004b944..73a39f2923aa7536ce65ea3ee514805122be79b1 100755 (executable)
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -22,11 +22,6 @@ test_expect_success 'prepare repository' '
        test_commit 4 B
 '
 
-test_expect_success 'rebase --root expects --onto' '
-       git checkout -B fail other &&
-       test_must_fail git rebase --root
-'
-
 test_expect_success 'rebase --root fails with too many args' '
        git checkout -B fail other &&
        test_must_fail git rebase --onto master --root fail fail
@@ -138,7 +133,7 @@ test_expect_success 'set up second root and merge' '
        rm A B C &&
        test_commit 6 D &&
        git checkout other &&
-       git merge third
+       git merge --allow-unrelated-histories third
 '
 
 cat > expect-third <<'EOF'