diff --git a/.gitattributes b/.gitattributes
index ff8ea93f0a..9a4ca70299 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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