cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added git attributes

Browse Source
This commit is contained in:
oranges
2015-12-16 10:40:48 +13:00
parent 46bd68f803
commit 8d282b7fea
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitattributes vendored
View File

@@ -1,10 +1,14 @@
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
* text=auto
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm
# 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
# force changelog merging to use union
html/changelog.html merge=union