Added .gitattributes

omar · Jan 8, 2013 · 13a62e4 · 13a62e4
1 parent dc29898
commit 13a62e4
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -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