Code Compare - File and Folder Merge Tool

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.

Code Compare Pro edition of the tool is specially adapted for comparing source code files. It locates changes in code with regard to its structure. Code Compare Pro features 3-way file merge tool that allows resolving version control merge conflicts.

Text Comparison and Merging

  • 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

More about file comparison

Structural Source Code Comparison

  • 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

More about comparing source code

Visual Studio Integration

  • Native Visual studio extension allows smooth integration
  • Visual Studio 2010, 2012, and 2013 supported
  • User can choose to use standalone or integrated version of Code Compare on the fly
  • Atmel Studio 6.0 and 6.1 supported

More about integration:


Code Review Support

  • Adding code review comments when comparing source file revisions
  • Viewing added review comments from a file comparison document
  • Highlighting of code regions with review comments
  • Feature works in combination with Review Assistant
  • Teams benefit more than solo developers

More about Review Assitant

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

More about 3-way merging


Compares entire hierarchies of folders

  • Color-coding for added, deleted, and modified files
  • Filtering options for excluding or including of certain file types
  • Instant opening of individual file comparison documents
  • Display options for better comparison result analysis
  • Batch file copying from pane to pane or to selected folder

More about comparing and synchronizing folders

Editions


Free

  • 2-way text comparison and merge
  • Folder structure comparison and merge
  • Visual Studio integration
  • Command-line interface


Professional

  • 3-way text comparison
  • Structural source code comparison
  • Automatic merging
  • Word-by-word text comparison
$49.95


More about Code Compare Editions

Testimonials

Best code diffing tool I've ever used. Ability to edit the current version directly in the tool is great both for easy reversal of changes as well as for formatting, as is the case when diffing poorly formatted code (e.g. single line XML documents).

Alex Boesel

More product reviews on Visual Studio Gallery




This is a very powerful tool, and it integrates well with Visual Studio. The more I use it, the more flexible I find it to be. It lets me edit the code on the fly in the difference window, and even set breakpoints. It's phenomenally better than the native diff in Visual Studio.

Martin L. Shoemaker
  • Code Compare - File Diff and File Merge Tool, Folder Compare Tool
  • Code Compare Oriented
  • Code Compare Integration to Visual Studio
  • Three-way comparison and merge in Code Compare
  • Folder Synchronization in Code Compare