better crossplatform support for source control with .gitattribute

theaob · Nov 11, 2013 · 7e34042 · 7e34042
1 parent 2483ab8
commit 7e34042
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union