Files
S.P.L.U.R.T-Station-13/.gitattributes
Jordan Brown e37a9a36ed Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger
Add a Python script to fix DMI conflicts
2018-05-25 10:55:33 -05:00

7 lines
172 B
Plaintext

# merger hooks, run tools/hooks/install.bat or install.sh to set up
*.dmm merge=dmm
*.dmi merge=dmi
# force changelog merging to use union
html/changelog.html merge=union