Author: llu
Date: Sat Oct 12 04:55:06 2013
New Revision: 1531501
URL: http://svn.apache.org/r1531501
Log:
Workaround git eol hell
Modified:
hadoop/common/trunk/.gitattributes
Modified: hadoop/common/trunk/.gitattributes
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/.gitattributes?rev=1531501&r1=1531500&r2=1531501&view=diff
==============================================================================
--- hadoop/common/trunk/.gitattributes (original)
+++ hadoop/common/trunk/.gitattributes Sat Oct 12 04:55:06 2013
@@ -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
