Merge branch 'git-p4' of git://repo.or.cz/git/git-p4

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index b947ed83bb1b1d61690df1140ede337b15cb04ed..a07ff42c2ff8e9a918d83435043a73f6404a9a9e 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply symlinks and partial files
+test_description='git apply symlinks and partial files
 
 '