Merge branch 'jn/xml-depends-on-asciidoc-conf'

diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 164f1538557d2026c46ccf6b40381ab7ba0c501a..f0d5041c11581ec2d711c0ea3bfd479019814b78 100755 (executable)
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -67,10 +67,7 @@ test_expect_success SYMLINKS 'diff removed symlink and file' '
 '
 
 test_expect_success SYMLINKS 'diff identical, but newly created symlink and file' '
-       cat >expected <<-\EOF &&
-       diff --git a/frotz b/frotz
-       diff --git a/nitfol b/nitfol
-       EOF
+       >expected &&
        rm -f frotz nitfol &&
        echo xyzzy >nitfol &&
        test-chmtime +10 nitfol &&