Merge branch 'maint'

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 620a9207bf14f5a7e2506742f1e7d0ddb91d0a78..b540f7295a1bb48bf044d297201b07aca9fb5005 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Junio C Hamano
 #
 
-test_description='git-apply --whitespace=strip and configuration file.
+test_description='git apply --whitespace=strip and configuration file.
 
 '