Merge branch 'maint'

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 08c11319a70be6dfbcc530d9462c36254a3acd8e..2e3c20d6b9468bf413e97d422e7dbe13ac4238cd 100755 (executable)
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -49,7 +49,7 @@ rename from path0
 rename to path1
 --- a/path0
 +++ b/path1
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ Line 7
  Line 8
  Line 9
  Line 10