add .gitattributes

CICM · Sep 12, 2014 · e03e287 · e03e287
1 parent d0387eb
commit e03e287
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,8 @@
+# MaxMSP
+*.mxo binary merge=ours
+*.exec binary merge=theirs
+*.exe binary merge=theirs
+*.maxpat binary merge=theirs
+*.maxhelp binary merge=theirs
+*.png binary merge=binary
+*.app binary merge=binary