Download

Code Compare is a powerful file and folder merge tool that demonstrates a new level of code comparison. Code Compare is the tool specially adapted for comparing source code files. It locates changes in code with regard to its structure. Code Compare features 3-way file merge tool that allows resolving version control merge conflicts. Key features: * 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 * 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 * Visual Studio Integration: *Native Visual studio extension allows smooth integration *Visual Studio 2010, 2012, 2013, 2015, 2017 and 2019 is supported *Choose to use standalone or integrated Code Compare on the fly *Atmel Studio 6.0 and 6.1 supported * 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 * 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 * And much more.