summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-03-08 20:38:45 -0300
committershennetsind <ind@henn.et>2013-03-08 20:38:45 -0300
commitbb0f807d0683fcb2c0e9fdd6a5d1e54686dfc816 (patch)
tree840d5bf4b629435cc7edd8fc1b41f0e934b5b834
parentbc63ef1225dadcfa2ba20a9b073de801ee177992 (diff)
downloadhercules-bb0f807d0683fcb2c0e9fdd6a5d1e54686dfc816.tar.gz
hercules-bb0f807d0683fcb2c0e9fdd6a5d1e54686dfc816.tar.bz2
hercules-bb0f807d0683fcb2c0e9fdd6a5d1e54686dfc816.tar.xz
hercules-bb0f807d0683fcb2c0e9fdd6a5d1e54686dfc816.zip
mkbu95's .gitattributes
Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--.gitattributes10
1 files changed, 10 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..3820cfc1d
--- /dev/null
+++ 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 \ No newline at end of file