Files
CHOMPStation2/.gitattributes
2014-11-26 21:28:40 +00:00

11 lines
285 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