Skip to content

Instantly share code, notes, and snippets.

View Marc-Ducret's full-sized avatar
🐼
Hunting bugs

Marc Ducret Marc-Ducret

🐼
Hunting bugs
View GitHub Profile
* text=auto
# Unity files
*.meta -text merge=unityyamlmerge diff
*.unity -text merge=unityyamlmerge diff
*.asset -text merge=unityyamlmerge diff
*.prefab -text merge=unityyamlmerge diff
*.mat -text merge=unityyamlmerge diff
*.anim -text merge=unityyamlmerge diff
*.controller -text merge=unityyamlmerge diff