'Conflict Resolution Tool' and 'Diff viewer' are the best tools for the job I've seen so far. I want to set them as external tools for TortoiseSVN. How to do it? I found that "idea.exe diff file1 file2" works but only for certain file types. Hot to make it to accept all files and how to invoke it for 3-way-merge?