Extend .gitattributes

paiden · Apr 2, 2016 · f991a34 · f991a34
1 parent f409645
commit f991a34
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,12 +1,14 @@
 # Enalbe auto eol handling
-* text=auto !eol
+* 			text=auto
 
 # Text Files auto handle
-*.config text
-*.cs text diff=csharp
-*.md text
-*.nuspec text
-*.ps1 text
+*.config 	text
+*.cs 		text diff=csharp
+*.md 		text
+*.nuspec 	text
+*.ps1 		text
+*.csproj	text merge=union
+
 
 # Text Files CR LF
-*.sln text eol=crlf
+*.sln 		text merge=union eol=crlf