Files
Yogstation/.gitattributes
2015-12-17 15:19:34 +13:00

15 lines
309 B
Plaintext

code/* text=auto
# 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