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.
Here’s a script I came up with to extract any project’s CVS repository from Sourceforge and convert it into a Git repository. To run it you’ll need Git and Subversion installed on your machine.