From e97ddc25dbafce119071e5a9ecda0ebcb6536668 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sun, 24 May 2015 01:16:34 -0700 Subject: [PATCH] gitattributes (maybe). --- .gitattributes | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..4bcb1169e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +* text=auto whitespace=blank-at-eol,tab-in-indent,trailing-space,tabwidth=2 + +*.bat text eol=crlf +*.sh text eol=lf + +*.sln text eol=crlf -whitespace +*.csproj text eol=crlf -whitespace merge=union +*.vcxproj text eol=crlf -whitespace merge=union +*.props text eol=crlf -whitespace merge=union