Eric Sink of SourceGear fame has posted that SourceGear have released DiffMerge, a free tool for comparing and merging source files and folders. It includes:
- 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
There aren’t that many good, free merge tools around, and certainly not many that provide three-way merge and intra-line highlighting.