14 lines
654 B
Plaintext
14 lines
654 B
Plaintext
# Unity YAML assets — UnityYAMLMerge (Smart Merge) driver.
|
|
# Register the driver in repo config (merge.unityyamlmerge.*); without it git falls back to text merge.
|
|
# No eol attribute on purpose (do not renormalize existing CRLF/LF).
|
|
*.unity merge=unityyamlmerge
|
|
*.prefab merge=unityyamlmerge
|
|
*.asset merge=unityyamlmerge
|
|
*.mat merge=unityyamlmerge
|
|
*.controller merge=unityyamlmerge
|
|
*.anim merge=unityyamlmerge
|
|
*.overrideController merge=unityyamlmerge
|
|
*.physicMaterial merge=unityyamlmerge
|
|
*.playable merge=unityyamlmerge
|
|
*.meta merge=unityyamlmerge
|