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
I really like Sourcegear Diffmerge. http://www.sourcegear.com/diffmerge/