Tools for SVN Merging

Question

SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don\'t serve me very well. At the moment I\'m using a combi

Answer 1

I have recently started using the new Beyond Compare 3 (for Windows and Linux). It seems to consistently make better automated merge decisions then TortoiseSVN or KDiff3. Particularly on whitespace, I believe this is due to BC3s better file type configuration.

I also think its merge interface is cleaner and easier to understand then KDiff.