See changes between two files presented in the form of a graphic.
Graphically shows the changes between two files, including intra-line highlighting and full support for editing. Allows automatic 3-way merging (when safe to do so) and full control over editing the resulting file. Configurable rulesets and options provide for customized appearance and behavior.
Great diff & merge functionality. Reminds me of one of my old favorite diff tools, winmerge. However, this tool is cross platform (windows, mac, linux), so I don't have to use "different" ;-) tools each time I switch platforms.
Cons
None, ... yet
Summary
Best free diff/merge tool that I've found so far.
Terrific program
ndcdon
Pros
Easy to install and use. Does exactly what I needed.