From b83364d1c7b89713379f64e2b85d2229fc4f8751 Mon Sep 17 00:00:00 2001
From: Luke Lu <llu@apache.org>
Date: Sat, 12 Oct 2013 04:55:06 +0000
Subject: [PATCH] Workaround git eol hell

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1531501 13f79535-47bb-0310-9956-ffa450edef68
---
 .gitattributes | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index af960483d22..ff8ea93f0a1 100644
--- 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