Code Compare

Code Compare is a compare tool designed to compare and merge differing files and folders. Code Compare integrates with 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.