t0301-credential-cache: use 'test_atexit' to stop the credentials helper

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 1f08a336878c21f67586d647571cea2ea85c3a73..4c69255ee6b14bdd52b6f840e2e528c182cb23ec 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -125,7 +125,7 @@ test_expect_success '`reset` refuses to overwrite untracked files' '
        : >dont-overwrite-untracked.t &&
        echo "reset refs/tags/dont-overwrite-untracked" >script-from-scratch &&
        test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-       test_must_fail git rebase -r HEAD &&
+       test_must_fail git rebase -ir HEAD &&
        git rebase --abort
 '
 
@@ -396,7 +396,7 @@ test_expect_success 'with --autosquash and --exec' '
        grep "G: +G" actual
 '
 
-test_expect_failure '--continue after resolving conflicts after a merge' '
+test_expect_success '--continue after resolving conflicts after a merge' '
        git checkout -b already-has-g E &&
        git cherry-pick E..G &&
        test_commit H2 &&