Photography
Computing
Tags
Filters
Templates
I was looking for a visual diff/merge too for linux today as I don't always use Eclipse. I stumbled upon Meld today and have been using it for some major merges for the last hour. Well I must say it's exactly what I was looking for so I'm happy to share.
Installation is easy on ubuntu:
apt-get install meld
There it how it looks like:
Discussion