about summary refs log tree commit diff
path: root/third_party/git/t/t3422-rebase-incompatible-options.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t3422-rebase-incompatible-options.sh')
-rwxr-xr-xthird_party/git/t/t3422-rebase-incompatible-options.sh10
1 files changed, 0 insertions, 10 deletions
diff --git a/third_party/git/t/t3422-rebase-incompatible-options.sh b/third_party/git/t/t3422-rebase-incompatible-options.sh
index a5868ea152f9..50e7960702da 100755
--- a/third_party/git/t/t3422-rebase-incompatible-options.sh
+++ b/third_party/git/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