Updated .gitattributes

.gitattributes

@@ -3,15 +3,5 @@
 
 # Custom for Visual Studio
 *.cs     diff=csharp
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.csproj text merge=union
+*.sln    text merge=union eol=crlf