This preference is now enabled: .
Use the following file paths to customize your external source control client.
Diff:
Merge:
AutoMerge:
comparisons