mirror of
https://github.com/evilew/GS13-Citadel.git
synced 2026-08-31 09:09:58 +01:00
7 lines
172 B
Plaintext
7 lines
172 B
Plaintext
# 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
|