You can use the Revision Control Diff/Merge setting to set an installed diff tool as the default revision tool. You can also use this setting to define a custom revision tool with specific layouts.
If you want to change the diff tool that Unity uses, open the Preferences window, and navigate to the External Tools section. Select your preferred tool from the Revision Control Diff/Merge dropdown list.
To set up a custom revision tool, follow these steps:
To specify file layout in the revision tool, use these arguments:
Property | Function |
---|---|
#LTITLE |
Left title |
#RTITLE |
Right title |
#ATITLE |
Ancestor title |
#LEFT |
Left file |
#RIGHT |
Right file |
#ANCESTOR |
Ancestor file |
#OUTPUT |
Output file |
#ABSLEFT |
Absolute path to the left file |
#ABSRIGHT |
Absolute path to the right file |
#ABSANCESTOR |
Absolute path to the ancestor file |
#ABSOUTPUT |
Absolute path to the output file |
Examples: