Permalink
Browse files

gitattributes

  • Loading branch information...
1 parent c01529b commit 773e3fcf3c2ea4375f64b99865e2ba6370263c45 @inspirer committed Jun 11, 2012
Showing with 8 additions and 4 deletions.
  1. +8 −4 .gitattributes
View
@@ -1,9 +1,13 @@
*.xml text
*.java text
-*.mpr text
-*.mps text
-*.mpl text
-*.msd text
+*.mpr text merge=mps
+*.mps text merge=mps
+*.mpl text merge=mps
+*.msd text merge=mps
debug.info text
.dependencies text
.generated text
+*.devkit merge=mps
+trace.info merge=mps
+dependencies merge=mps
+generated merge=mps

0 comments on commit 773e3fc

Please sign in to comment.