Merge branch 'ds/feature-macros'

diff --git a/t/t9817-git-p4-exclude.sh b/t/t9817-git-p4-exclude.sh
index 275dd304258311703ed596ce25a1b67ef3bcc110..ec3d937c6a73bb8d89de51839af4bba4c3a73910 100755 (executable)
--- a/t/t9817-git-p4-exclude.sh
+++ b/t/t9817-git-p4-exclude.sh
@@ -105,8 +105,4 @@ test_expect_success 'clone, then sync with exclude, no trailing /' '
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done