Code Compare is a free tool designed to compare and merge differing files and folders. Code Compare integrates with all popular source control systems: TFS, SVN, Git, Mercurial, and Perforce. Code Compare is shipped both as a standalone file diff tool and a Visual Studio extension.
Ranked in these QuestionsQuestion Ranking
Pro Three-way comparison and automatic merging
Three comparison panes with horizontal and vertical layouts
- Integrates with version control systems as the merging tool for conflicting file revisions
- Non-conflicting changes are merged automatically
- Merging conflicts are highlighted
- One-click conflict resolution with a mouse button
Pro Offers free version and paid for version
You get a lot more if you pay for the pro version.
Pro Supports comparing folders
Can diff entire folders
Pro Integrated into Visual Studio
Can be used either as a stand-alone product or as the built in diff/merge tool for Visual Studio.
Con Free version is limited
Whereas there is a free version, it is missing a lot of great features that you're forced to pay for if you want.