Author: cnauroth
Date: Mon Oct 14 17:14:24 2013
New Revision: 1531984
URL: http://svn.apache.org/r1531984
Log:
HADOOP-10040. Merging change r1531983 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/.gitattributes
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
(props changed)
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
(props changed)
Modified: hadoop/common/branches/branch-2/.gitattributes
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/.gitattributes?rev=1531984&r1=1531983&r2=1531984&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/.gitattributes (original)
+++ hadoop/common/branches/branch-2/.gitattributes Mon Oct 14 17:14:24 2013
@@ -13,8 +13,8 @@
*.sh text eol=lf
-*.bat binary
-*.cmd binary
-*.vcxproj binary
-*.csproj binary
-*.sln binary
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.vcxproj text merge=union eol=crlf
+*.csproj text merge=union eol=crlf
+*.sln text merge=union eol=crlf
Propchange:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
------------------------------------------------------------------------------
svn:eol-style = native
