SourceGear DiffMerge - Free Cross Platform GUI Diff & Merge Utility

Eric.Weblog() - Free Diff Tool: SourceGear DiffMerge

"...

DiffMerge is "free of charge", or as some folks say, "free as in beer".  DiffMerge is not open source nor is it "free" in the Richard Stallman sense of the word.  DiffMerge is a no-cost application that anyone can download and use.  It is not a trial, a demo or an eval.  It is fully functional and fully featured.

...

So, we're unveiling SourceDiffMerge 3.0 as our attempt to be the best of the breed.  I'm not sure we've hit the target, but we've come very close.  Highlights include:

• Compare two text files
• Lots of supported character encodings
• Intra-line highlighting of the changed portion of a line
• Three-way merge, including automatic merge whenever possible
• Compare folders
• Cross-platform:  Runs on Windows and Mac OS X.  Oh, and Linux too.
• Full support for editing
• Fully customizable

..."

I was just looking for a Windows GUI Diff app the other day. This one looks pretty cool and is perfectly priced...

[Download]

(via dzone - Free Diff Tool: SourceGear DiffMerge)