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

Meld is arguably one of the best and one of the most used tools for non-win32. On Windows or with Wine WinMerge wins hands down. Some alternatives for Linux:

• Kompare
• KDiff3
• DirDiff

P.S. Actually on Windows the TortoiseSVN merge tool gives great results too :)