Compare and Merge

Compare and Merge is a visual file comparison 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: You can now drag-and-drop text (easier merging). Quickly copy or delete single lines instead of whole blocks. New keyboard shortcuts. Speed improvements and bug fixes.