Jake Ginnivan's blog

TFS Merge Tools Configuration

When I first install Visual Studio and TFS Explorer, high on my priorities is to configure a decent merge tool.

This blog post http://blogs.msdn.com/b/jmanning/archive/2006/02/20/diff-merge-configuration-in-team-foundation-common-command-and-argument-values.aspx lists all common merge tools, and the command line arguments for each of them.

I use KDiff, so the Compare arguments are %1 --fname %6 %2 --fname %7 and Merge arguments are %3 --fname %8 %2 --fname %7 %1 --fname %6 -o %4

Great, except I have to register all the extensions that I want to use KDiff for. This is my list:


What other extensions am I missing?