I have found recently that KDiff3 is better than IDEA at resolving merge conflicts.
The other good thing is that when it can't resolve all the conflicts it doesn't leave you with a two way merge like IDEA but resolves as many as possible with its 3-way merge algorithm then lets you resolve the last few.
It would be great if IDEA could resolve the merges as well as KDiff3 but in the meantime I am trying to set it up as an external merge
It installs the following options to TortoiseSVN:
C:\Program Files (x86)\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs
I tried this option in IDEA but although KDiff3 pops up when I click merge, the conflicts don't get marked as resolved in IDEA once I am finished.
%2 %1 %3 -o %4
Is there something else I need to do?