Permalink
Browse files

Added .gitattributes

  • Loading branch information...
omar committed Jan 8, 2013
1 parent 6839eea commit 2d13b999a974159077b9b62f219a7ce1350c3378
Showing with 12 additions and 0 deletions.
  1. +12 −0 .gitattributes
View
@@ -0,0 +1,12 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+*.cs text diff=csharp
+*.java text diff=java
+*.html text diff=html
+*.css text
+*.js text
+*.sql text
+
+*.csproj text merge=union
+*.sln text merge=union eol=crlf

0 comments on commit 2d13b99

Please sign in to comment.