mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
11 lines
287 B
Plaintext
11 lines
287 B
Plaintext
# 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
|
|
|
|
# force changelog merging to use union
|
|
html/changelog.html merge=union
|