Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger

Add a Python script to fix DMI conflicts
2018-05-25 11:54:36 -04:00
parent cc088d9113
commit e37a9a36ed
8 changed files with 446 additions and 9 deletions
@@ -1,12 +1,6 @@
-# dmm map merger hook
-# needs additional setup, see tools/mapmerge/install.txt
-*.dmm merge=merge-dmm
-
-# dmi icon merger hook
-# needs additional setup, see tools/dmitool/merging.txt
-*.dmi merge=merge-dmi
+# merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm merge=dmm
+*.dmi merge=dmi

 # force changelog merging to use union
 html/changelog.html merge=union
-
-