Files
Yogstation/.gitattributes
Francis Devine fde15613d4 attributes revert
2015-12-17 15:33:33 +13:00

13 lines
291 B
Plaintext

# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm binary
# dmi icon merger hook
# needs additional setup, see tools/dmitool/merging.txt
*.dmi merge=merge-dmi binary
# force changelog merging to use union
html/changelog.html merge=union