KDiff3 – Nice Tool for Diffs

KDiff3 is a great tool to do all sorts of textbased diffs. I use it regularly to resolve merge-conflicts in subversion. It can of course also be used to manage 3-way-diffs.

Just mark 2-3 files in your file-explorer, right-click and choose ‘KDiff3 / Compare’ and you get a nice screen like this one:

http://kdiff3.sourceforge.net