Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Written with Python and GTK. More info »
This is the prettiest diff display I've seen. Only wish it had binaries for Windows. It apparently runs, but you have to jump through a lot of hoops (http://live.gnome.org/Meld/Windows)
Create an account or sign in to be able to comment. It's a two click operation with OpenId or Facebook Connect!
