Merge branch 'js/mingw-spawn-with-spaces-in-path' into maint

diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index cde9f86cd6996f05b45d698e3f114d2e7da613a0..e9276c48f4a2e795899a03681a737c70635ab39c 100755 (executable)
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -180,8 +180,5 @@ test_expect_success 'unshelve specifying the origin' '
                test_path_is_file file_to_shelve
        )
 '
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
 
 test_done