Merge branch 'js/export-with-assignment'

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index edae7056e409fb2314bd1db1b4689f55ed08248b..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.
 
 '
 
@@ -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 &&