tests: stop testing `git rebase --preserve-merges`

[thirdparty/git.git] / t / t3422-rebase-incompatible-options.sh

diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index c8234062c6c8322d92f5054cf76b164446227cfc..eb0a3d9d48738375bfe74c199aa5e8116d30dd3d 100755 (executable)
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -63,15 +63,4 @@ test_rebase_am_only () {
 test_rebase_am_only --whitespace=fix
 test_rebase_am_only -C4
 
-test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
-       git checkout B^0 &&
-       test_must_fail git rebase --preserve-merges --signoff A
-'
-
-test_expect_success REBASE_P \
-       '--preserve-merges incompatible with --rebase-merges' '
-       git checkout B^0 &&
-       test_must_fail git rebase --preserve-merges --rebase-merges A
-'
-
 test_done