Merge branch 'jk/unused-params-final-batch'

diff --git a/t/t9820-git-p4-editor-handling.sh b/t/t9820-git-p4-editor-handling.sh
index 6dc6df032ec0c15b39dccd24ade52580fc115add..fa1bba1dd93614c8ad5c7f4a37c5b612440fd0eb 100755 (executable)
--- a/t/t9820-git-p4-editor-handling.sh
+++ b/t/t9820-git-p4-editor-handling.sh
@@ -26,13 +26,9 @@ test_expect_success 'EDITOR with options' '
                cd "$git" &&
                echo change >file1 &&
                git commit -m "change" file1 &&
-               P4EDITOR=": >\"$git/touched\" && test-chmtime +5" git p4 submit &&
+               P4EDITOR=": >\"$git/touched\" && test-tool chmtime +5" git p4 submit &&
                test_path_is_file "$git/touched"
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done