Merge branch 'maint-1.5.4' into maint

diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index 27cc6f2b88974051cd521755800342e375d84af7..1d531caf798b9e8dfbe17714ad1eb09be14f7f93 100755 (executable)
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
-test_description='git-apply with new style GNU diff with empty context
+test_description='git apply with new style GNU diff with empty context
 
 '
 
@@ -53,4 +53,3 @@ test_expect_success 'apply --apply' '
 '
 
 test_done
-