See http://blogs.msdn.com/jmanning/articles/535573.aspx for more information on configuring TFS with external diff/merge tools. The option is available under Tools, Options, Source Control, Visual Studio Team Foundation Server, Configure User Tools... For DiffMerge the syntax would be:- Compare: /t...