From 98e19f716f441327a9cb57bbbea398d48fc0e135 Mon Sep 17 00:00:00 2001 From: Furkan Kambay Date: Tue, 8 Jan 2019 22:37:49 +0300 Subject: [PATCH] Add missing YAML files to .gitattributes --- src/GitHub.Api/Resources/.gitattributes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/GitHub.Api/Resources/.gitattributes b/src/GitHub.Api/Resources/.gitattributes index da4c9970c..0f7d6e7dc 100644 --- a/src/GitHub.Api/Resources/.gitattributes +++ b/src/GitHub.Api/Resources/.gitattributes @@ -6,6 +6,23 @@ *.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 +*.overrideController -text merge=unityyamlmerge diff +*.physicMaterial -text merge=unityyamlmerge diff +*.physicsMaterial2D -text merge=unityyamlmerge diff +*.playable -text merge=unityyamlmerge diff +*.mask -text merge=unityyamlmerge diff +*.brush -text merge=unityyamlmerge diff +*.flare -text merge=unityyamlmerge diff +*.fontsettings -text merge=unityyamlmerge diff +*.guiskin -text merge=unityyamlmerge diff +*.giparams -text merge=unityyamlmerge diff +*.renderTexture -text merge=unityyamlmerge diff +*.spriteatlas -text merge=unityyamlmerge diff +*.terrainlayer -text merge=unityyamlmerge diff +*.mixer -text merge=unityyamlmerge diff +*.shadervariants -text merge=unityyamlmerge diff # Image formats *.psd filter=lfs diff=lfs merge=lfs -text