Merge branch 'jk/no-textconv-symlink' into maint

diff --git a/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial b/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
index 49e26fb99a779a52a1f9613353dfefc0ac0a5ce0..d5c333a378c9407abf179d6cc3f5233ca8b5f116 100644 (file)
--- a/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
+++ b/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
@@ -1,6 +1,5 @@
 $ git diff-tree --pretty=oneline --root --patch-with-stat initial
 444ac553ac7612cc88969031b02b3767fb8a353a Initial
----
  dir/sub |    2 ++
  file0   |    3 +++
  file2   |    3 +++