Thank you for helping us improve the quality of Unity Documentation. Although we cannot accept all submissions, we do read each suggested change from our users and will make updates where applicable.
CloseFor some reason your suggested change could not be submitted. Please <a>try again</a> in a few minutes. And thank you for taking the time to help us improve the quality of Unity Documentation.
Closepath | Diff tool path. |
twoWayDiff | Two - way diff command line. |
threeWayDiff | Three - way diff command line. |
mergeCommand | Merge command line. |
forceEnableCustomTool | Sets Custom Tool as current active Revision Control Diff/Merge tool. |
Set custom diff tool settings.
using UnityEditor; using UnityEngine;
public class EditorScript : MonoBehaviour { [MenuItem("SetCustomDiffTool/DiffMerge")] public static void ExampleSetCustomDiffTool() { string path = "/Applications/DiffMerge.app/Contents/MacOS/DiffMerge"; string twoWayDiffCommandLine = "-t1 #LTITLE -t2 #RTITLE #LEFT #RIGHT"; string threeWayDiffCommandLine = "-t1 #LTITLE -t2 #ATITLE -t3 #RTITLE -ro2 #LEFT #ANCESTOR #RIGHT"; string mergeArguments = "-m -t1 #LTITLE -t2 #ATITLE -t3 #RTITLE -r #OUTPUT #LEFT #ANCESTOR #RIGHT";
EditorUtility.SetCustomDiffTool(path, twoWayDiffCommandLine, threeWayDiffCommandLine, mergeArguments); } }
For more information about diff tools, see Revision Control Diff/Merge.