Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh
index 157ed85a79765d1400c89614109c502f17a6a7c3..a894c6062271c53b688830a3230d1c78fb561d70 100755 (executable)
--- a/t/t4031-diff-rewrite-binary.sh
+++ b/t/t4031-diff-rewrite-binary.sh
@@ -46,7 +46,7 @@ test_expect_success 'rewrite diff can show binary patch' '
 
 {
        echo "#!$SHELL_PATH"
-       cat >dump <<'EOF'
+       cat <<'EOF'
 perl -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
 EOF
 } >dump