CodeCompare

Code Compare is an essential file and folder merge tool that can compare and merge differing files and folders.
This effective tool allows to compare your files and folders without any errors. The effective tool makes it possible to compare and merge differing files and folders. The fully functional tool integrates with all popular source control systems: TFS, SVN, Git, Mercurial, and Perforce. With amazing capabilities this tool supports various features like: simple integration into Visual Studio 2010, 2012, 2013 and 2015; support for automatic file merging, support for command line interface and VCS integration, supports file editor with search and bookmarks, it uses the Intellisense while comparing code, supports syntax highlighting for multiple languages, allows 3-way comparison and merge, and much more.
Code Compare, also provides support for source control systems and the ability to Detect similar lines.

Code Compare is a free file and folder merge tool from Devart. New version of Code Compare comes with significantly increased startup speed:
- Standalone application start is two times faster;
- Opening a file comparison document in Visual Studio is two times faster;
- Considerable acceleration of the first environment start after installing Code Compare.
The text comparison interface of the application has been reworked to become more self-explanatory and user-friendly. Now practically all elements of this diff and merge tool's interface have their own function.
Folder comparison has been enhanced with a range of new features:
- The speed of directory comparison has increased by 40%;
- Commands for navigation through changes have been implemented;
- Commands for multiple files selection by the type of change have been added;
- The possibility to copy the selected files to a user-defined directory has been added;
- The concepts of copying files and synchronizing directories have been split. From now on the user manages the process of changes moving in a more accurate way;
- The possibility to overwrite read-only files during copying has been added.
Code Compare integration into the Atmel Studio has been implemented. Developers of Atmel processor-based and micro-controller applications are able to use all the advantages of Code Compare integration into the development environment.
Key features:
* Two-way file comparison and merge
* Folder comparison and merge
* Integration into Visual Studio 2010, and 2012
* Command line interface and VCS integration
* File editor with search and bookmarks
* Use Intellisense while comparing code
* Syntax highlighting for multiple languages
* Show changes within compared code lines