Sync with maint

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 87b4acc9a686e0153435969131bff7e9df161dce..8c12c65c72658acb37fa715fc93756381bc824bb 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -23,6 +23,7 @@ test_expect_success $PREREQ \
       echo do
       echo "  echo \"!\$a!\""
       echo "done >commandline\$output"
+      test_have_prereq MINGW && echo "dos2unix commandline\$output"
       echo "cat > msgtxt\$output"
       ) >fake.sendmail &&
      chmod +x ./fake.sendmail &&