mkbu95's .gitattributes

Signed-off-by: shennetsind <ind@henn.et>
HerculesWS · Mar 8, 2013 · bb0f807 · bb0f807
1 parent bc63ef1
commit bb0f807
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,10 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+*.c      diff=cpp
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union