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
More about file comparison
More about comparing source code
More about integration:
More about Review Assitant
More about 3-way merging
More about comparing and synchronizing folders
More about Code Compare Editions
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).
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.