Code Compare – free file and folder diff & merge tool, Visual Studio integrated.

Code Compare is a powerful file and folder merge tool that demonstrates a new level of code comparison. 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 an extension for Microsoft Visual Studio.

Key features:
* Folder comparison and merge
* Integration into Visual Studio 2010, 2012 and 2013
* Automatic File Merging
* 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
* 3-way comparison and merge
* Structure code comparison
* Changes navigation window
* Difference Explorer
* Unchanged regions collapsing
* Word-by-word file comparison
* Support for source control systems
* Detection of similar lines