Merge branch 'ei/oneline+add-empty'

diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index 620a9207bf14f5a7e2506742f1e7d0ddb91d0a78..edae7056e409fb2314bd1db1b4689f55ed08248b 100755 (executable)
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -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 &&