When running fedora and KDE, I used kdiff3. Now I've moved to Ubuntu and gnome and was looking for a replacement. I found meld. It has all the features kdiff3 had. Here is a screenshot :
You can download it with the following command :
sudo apt-get meld
