Code Compare is a free tool designed to compare and merge differing files and folders.

• Colored blocks for inserted, deleted, and modified text
• Detailed highlights of changes within lines
• Collapsing of unchanged regions of text (Pro-feature)
• Point-and-click merging with a mouse
• Editing files on the fly
• Merging shortcuts for advanced users

• Syntax Highlighting for programming languages
• Methods are matched in compared source code files
• Similar lines of code are matched even after refactoring
• Moved blocks of code are detected if source code is reordered in files
• Difference Explorer window displays changes in code structure
• Code outlining allows collapsing and expanding regions of code