summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 412eeda..157cc39 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,9 @@
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
+*.cproj merge=union
+
+
# Standard to msysgit
*.doc diff=astextplain