Merge pull request #184 from github-for-unity/fixes/unity-yaml-merge-path

Fixing UnityYAMLMerge path

Author: shana

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -79,7 +79,10 @@ public ITask InitializeRepository()
 
             var targetPath = NPath.CurrentDirectory;
 
-            var unityYamlMergeExec = Environment.UnityApplication.Parent.Combine("Tools", "UnityYAMLMerge");
+            var unityYamlMergeExec = Environment.IsWindows
+                ? Environment.UnityApplication.Parent.Combine("Data", "Tools", "UnityYAMLMerge.exe")
+                : Environment.UnityApplication.Combine("Contents", "Tools", "UnityYAMLMerge");
+
             var yamlMergeCommand = Environment.IsWindows
                 ? $@"'{unityYamlMergeExec}' merge -p ""$BASE"" ""$REMOTE"" ""$LOCAL"" ""$MERGED"""
                 : $@"'{unityYamlMergeExec}' merge -p '$BASE' '$REMOTE' '$LOCAL' '$MERGED'";