Merge pull request #995 from github-for-unity/fixes/more-gitattributes

Material files also need to be in .gitattributes

Author: shana

src/GitHub.Api/Resources/.gitattributes

@@ -5,6 +5,7 @@
 *.unity -text merge=unityyamlmerge diff
 *.asset -text merge=unityyamlmerge diff
 *.prefab -text merge=unityyamlmerge diff
+*.mat -text merge=unityyamlmerge diff
 
 # Image formats
 *.psd filter=lfs diff=lfs merge=lfs -text