apply: register conflicted stages to the index

diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
index f0022839c76ede4b5f135a7318b9c53ede4a944a..2f8014a60ef07d84430b9a696d46cd63c4822524 100755 (executable)
--- a/t/t9808-git-p4-chdir.sh
+++ b/t/t9808-git-p4-chdir.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-p4 relative chdir'
+test_description='git p4 relative chdir'
 
 . ./lib-git-p4.sh
 
@@ -26,7 +26,7 @@ test_expect_success 'P4CONFIG and absolute dir clone' '
        (
                P4CONFIG=p4config && export P4CONFIG &&
                sane_unset P4PORT P4CLIENT &&
-               "$GITP4" clone --verbose --dest="$git" //depot
+               git p4 clone --verbose --dest="$git" //depot
        )
 '
 
@@ -38,7 +38,7 @@ test_expect_success 'P4CONFIG and relative dir clone' '
        (
                P4CONFIG=p4config && export P4CONFIG &&
                sane_unset P4PORT P4CLIENT &&
-               "$GITP4" clone --verbose --dest="git" //depot
+               git p4 clone --verbose --dest="git" //depot
        )
 '