Sync with maint

diff --git a/.gitattributes b/.gitattributes
index 9fa72ad4503031528e24e7c69f24ca92bcc99914..b08a1416d86012134f823fe51443f498f4911909 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
 *.pl eof=lf diff=perl
 *.pm eol=lf diff=perl
 *.py eol=lf diff=python
+*.bat eol=crlf
 /Documentation/**/*.txt eol=lf
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf