We continue to review the integration of Diff and Merge various types of documents in TFS Visual Studio 2010 or Visual Studio 11.
Diff and Merge tools built-in TFS Visual Studio 2010 are not very convenient. For this purposes it is better to use console applications that are easily integrated via the command line.
Read the full article, following the link (ru).