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

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 620a9207bf14f5a7e2506742f1e7d0ddb91d0a78..65571e05496eb3710cb89d93f5b95d34b77d1998 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.
 
 '
 
@@ -24,7 +24,7 @@ cat >gpatch.file <<\EOF &&
 +++ file1+     2007-02-21 01:07:44.000000000 -0800
 @@ -1 +1 @@
 -A
-+B 
++B
 EOF
 
 sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&