Workaround git eol hell

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531502 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luke Lu 2013-10-12 04:58:24 +00:00
parent 4f3386420c
commit 1b86bbcf4a
1 changed files with 5 additions and 4 deletions

9
.gitattributes vendored
View File

@ -13,7 +13,8 @@
*.sh text eol=lf *.sh text eol=lf
*.bat text eol=crlf *.bat binary
*.cmd text eol=crlf *.cmd binary
*.csproj text merge=union eol=crlf *.vcxproj binary
*.sln text merge=union eol=crlf *.csproj binary
*.sln binary