Compare and Merge

Compare and Merge is a visual file and source code compare utility. It lets you see the differences between text files, and makes it easy to resolve these differences.

For programmers, web developers, and anyone else who works with multiple revisions of files. New features: Quick Bar for faster compares, Smart Refresh mode, Explorer context menu, new options, various bug fixes and tweaks.