checkout: move 'confict_style' and 'dwim_..' to checkout_opts

diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 25aaacacfc6b7beb1e29b73678777a76c6af9f71..bdaa511bb0ae1082568e83781252f667b39cda8a 100755 (executable)
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -262,9 +262,6 @@ test_expect_success '--reschedule-failed-exec' '
        test_must_fail git -c rebase.rescheduleFailedExec=true \
                rebase -x false HEAD^ 2>err &&
        grep "^exec false" .git/rebase-merge/git-rebase-todo &&
-       test_i18ngrep "has been rescheduled" err &&
-       git rebase --abort &&
-       test_must_fail git rebase -y false HEAD^ 2>err &&
        test_i18ngrep "has been rescheduled" err
 '