Workaround git eol hell

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531502 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 04:58:24 +00:00 · 2013-10-12 04:58:24 +00:00 · 1b86bbcf4a
parent 4f3386420c
commit 1b86bbcf4a
1 changed files with 5 additions and 4 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -13,7 +13,8 @@

 *.sh     text eol=lf

-*.bat    text eol=crlf
-*.cmd    text eol=crlf
-*.csproj text merge=union eol=crlf
-*.sln    text merge=union eol=crlf
+*.bat    binary
+*.cmd    binary
+*.vcxproj binary
+*.csproj binary
+*.sln    binary