Bubberstation/tools/dmitool/git_merge_installer.bat at 346819e30c4e4b94de6871d4441b52c06995e770 - Bubberstation - Gitea

cyberpresidentvanellope/Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-15 03:27:46 +00:00

Files

Tkdrg 553ce69257 Adds the dmitool icon merger from baystation12

Credits to GinjaNinja32@bay12 for developing dmitool and
PsiOmegaDelta@bay12 for some of these scripts. Thanks also to
neersighted for reminding me that we need this.

Basically this is like the map merger, except for icons. You can install
a hook using the instructions in the dmitool folder, and it should
automatically merge your DMIs for you. This means you can solve icon
conflicts effortlessly most of the time.

2015-11-28 03:47:26 -03:00

7 lines

239 B

Batchfile

Raw Blame History

 @echo off
 set tab=
 echo. >> ../../.git/config
 echo [merge "merge-dmi"] >> ../../.git/config
 echo %tab%name = iconfile merge driver >> ../../.git/config
 echo %tab%driver = ./tools/dmitool/dmimerge.sh %%O %%A %%B >> ../../.git/config