I'm using Idea 8.1.2. I would like to use Beyond Compare's 3 way merge capability when resolving subversion conflicts.
I've customized the 'External Diff Tools' setting, and this works fine for comparing two files (e.g. - compare current file to latest repository version), but I don't see a setting for an external 3 way merge tool.
Am I missing an option somewhere?