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 Graphical showing of where code is added or removed
It does not add a blank line in the other code-pane to show where code was added or deleted. It simply draws a line to show point out its location.
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 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.
Pro Clear overview that marks only the changes, not every line with a change
Most compare tools mark every changed line with colour, making the code just a mess with thousands of coloured lines, while all that might be changed is a sign/character on each line. Code Compare draws boxes around each changed segment and highlights only the real change with a colour.
Pro Offers free version and paid for version
You get a lot more if you pay for the pro version.
Con Does not support custom comment markings
Some compilers use ";" to specify in-line commenting. But as that is not a common method, all added comments are marked as new code. So it becomes difficult to find changes in the functionality of the code.
Con Does not support move-detection
Very few programs detect move of blocks of code. Most just show deleted and added instead.
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.