mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
66ce799cfc
Set maps to be considered binaries in .gitattributes. Copied maps to non-conflict with upstream pulls, and updated in .dme
14 lines
334 B
Plaintext
14 lines
334 B
Plaintext
# dmm map merger hook
|
|
# needs additional setup, see tools/mapmerge/install.txt
|
|
# *.dmm merge=merge-dmm
|
|
|
|
# Nope, now they're binaries.
|
|
*.dmm binary
|
|
|
|
# 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
|