Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Fixing UnityYamlMerge #974

Merged
merged 1 commit into from
Nov 30, 2018
Merged

Fixing UnityYamlMerge #974

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/GitHub.Api/Resources/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
* text=auto

# Unity files
*.meta -text merge=unityamlmerge diff
*.unity -text merge=unityamlmerge diff
*.asset -text merge=unityamlmerge diff
*.prefab -text merge=unityamlmerge diff
*.meta -text merge=unityyamlmerge diff
*.unity -text merge=unityyamlmerge diff
*.asset -text merge=unityyamlmerge diff
*.prefab -text merge=unityyamlmerge diff

# Image formats
*.psd filter=lfs diff=lfs merge=lfs -text
Expand Down