merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 1e9d1a737c5369d1b41bfa75f5939ad41004b944..0b521057283bf106da8ce55f25f61c7ec7e3ad35 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