conditional markdown preprocessing

diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index a5868ea152f94108418175a4c8af583462c09fce..50e7960702da4fa0306818f305f5d735f2292f53 100755 (executable)
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -76,14 +76,4 @@ test_expect_success REBASE_P \
        test_must_fail git rebase --preserve-merges --rebase-merges A
 '
 
-test_expect_success '--rebase-merges incompatible with --strategy' '
-       git checkout B^0 &&
-       test_must_fail git rebase --rebase-merges -s resolve A
-'
-
-test_expect_success '--rebase-merges incompatible with --strategy-option' '
-       git checkout B^0 &&
-       test_must_fail git rebase --rebase-merges -Xignore-space-change A
-'
-
 test_done