Merge branch 'js/rebase-p-tests'

In preparation to the day when we can deprecate and remove the
"rebase -p", make sure we can skip and later remove tests for
it.

* js/rebase-p-tests:
tests: optionally skip `git rebase -p` tests
t3418: decouple test cases from a previous `rebase -p` test case
t3404: decouple some test cases from outcomes of previous test cases

diff --cc t/t3404-rebase-interactive.sh
Simple merge

diff --cc t/t3418-rebase-continue.sh
index 4c3f7d8dfea1fb087c839c3a039e728642869975,f0025c7810d5a3cb9827f9f1bff3feb476161b64..0210b2ac6f0709cce4bf7b656b3c61a751330e61
--- 1/t/t3418-rebase-continue.sh
--- 2/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@@ -240,17 -241,6 +241,17 @@@ test_rerere_autoupdat
  test_rerere_autoupdate -m
  GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
  test_rerere_autoupdate -i
- test_rerere_autoupdate --preserve-merges
+ test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges
 +unset GIT_SEQUENCE_EDITOR
 +
 +test_expect_success 'the todo command "break" works' '
 +      rm -f execed &&
 +      FAKE_LINES="break b exec_>execed" git rebase -i HEAD &&
 +      test_path_is_missing execed &&
 +      git rebase --continue &&
 +      test_path_is_missing execed &&
 +      git rebase --continue &&
 +      test_path_is_file execed
 +'
  
  test_done

diff --cc t/test-lib.sh
Simple merge