Files
vgstation13/.gitattributes
2014-06-12 11:50:20 -07:00

6 lines
166 B
Plaintext

# dmm map merger hook
# needs additional setup, see maptools/install.txt
*.dmm merge=merge-dmm
# force changelog merging to use union
html/changelog.html merge=union