koobas.hobune.stream
How can I select external merge tool other than Apple File Merge on OSX?
Hello
My level of insanity is not high enough to use Apple's FileMerge tool for merging scenes, and I have spent some time today to find a way to use something else for my Collab conflicts. Docs specify:
Choose which application you want Unity to use to resolve file differences with the Asset server. Unity detects these tools in their default installation locations (and checks registry keys for TortoiseMerge, WinMerge, PlasticSCM Merge, and Beyond Compare 4 on Windows).
Ummm I've installed Beyond Compare 4, restarted Unity but I still can't select anything else. To be honest, I would love to use a different tool then listed [Jetbrains Rider] but something less 80's like than Apple's tool will suffice.
You ever figure this out? I have a friend with the same issue.
