About Code Compare

Source Code file and folder comparison tool.

Code Compare is a tool designed to compare and merge differing files and folders. It integrates with all popular source control systems including TFS, SVN, Git, Mercurial, and Perforce. Code Compare is shipped both as a standalone file diff tool and a Visual Studio extension.

Code Compare Features

Comparison and Merging

  • Colored blocks for inserted, deleted, and modified text.
  • Detailed highlighting of changes within lines.
  • Collapsing of unchanged text regions.
  • Point-and-click merge with a mouse.
  • Editing files on the fly with a reliable file compare tool.
  • Merging shortcuts for advanced users.

Semantic Source Code Comparison

  • Structure comparison mode - comparing sources via their signature and not only by their location.
  • Lexical comparison from major programming languages – C#, C++, Visual Basic, JavaScript, Java, XML.
  • Syntax highlighting for programming languages.
  • Matching methods in compared source code files.
  • Similar lines of code are matched even after refactoring.
  • Detecting moved blocks of code if source code is reordered in files.
  • Displaying changes in code structure in Difference Explorer.
  • Code outlining for collapsing and expanding regions of code.

Folder Сomparison

  • Advanced diff directories compare utility.
  • Color-coding for added, deleted, and modified files.
  • Filtering options for excluding or including 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 a selected folder.

Visual Studio Integration

  • Compare code without leaving your favourite environment.
  • Native Visual studio extension for smooth integration.
  • Choose to use standalone or integrated Code Compare on the fly.
  • Link Code Compare to Android Studio as an external tool to compare and merge code.

Version Сontrol Integration

  • Colored blocks for inserted, deleted, and modified text.
  • 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.
  • Three-way comparison to compare and merge three files side-by-side.