git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531983 13f79535-47bb-0310-9956-ffa450edef68
@@ -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