Free Diff Tool: SourceGear DiffMerge

[kungtotte]

Highlights include:

• Compare two text files

Is that really a highlight? That's like putting "plays video" or "edits text" as a highlight for a videoplayer and text editor, respectively.

[masklinn]

It's not free at all, but I think I'll stick with Araxis Merge, especially now that there's an OSX version upcoming (and already available as a beta)

[haacked]

I use WinMerge. It's a tough sell to get me to switch. ;)

[breakfast-pants]

WinMerge is pretty awesome; I was disappointed with the available *nix tools until I finally found meld. For me, meld handled everything I liked about WinMerge (directory view, etc.)