diff --git a/.gitattributes b/.gitattributes index a839a28c99..00934f6efe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,11 @@ *.c diff=cpp *.sln merge=union *.vcproj merge=union -*.vcxproj merge=union \ No newline at end of file +*.vcxproj merge=union +*.sln text eol=crlf +*.bat text eol=crlf +configure text eol=lf +configure.in text eol=lf +Makefile text eol=lf +Makefile.in text eol=lf +*.sh text eol=lf