Having tried to fall in love with Meld and KDiff3, I’ve eventually gone back to my favourite merge tool, TortoiseMerge. It’s actually very straightforward to get running on Linux.

The basic steps are:

Install wine: apt-get install wine, or yum install wine.

Download the standalone version of TortoiseDiff from Sourceforge and extract TortoiseMerge.exe into ~/bin/.

Set up a new merge tool in your user configuration in Bazaar Explorer containing:

wine /home/pete/bin/TortoiseMerge.exe /base:{base} /theirs:{other} /mine:{this} /merged:{result}