How do I configure TFS to work with various merge tools

Question

Originally the question was \"How do I configure WinMerge as the compare and merge tool for TFS\". However, I am changing it because TehOne answered this more general form o

Answer 1

For SourceGear DiffMerge, you need to change the default command line to:

C:\Program Files (x86)\SourceGear\Vault Client\sgdm.exe

I found the parameters in this thread on the SourceGear support forums, as well as on James Manning's blog mentioned by @TehOne, but the arguments given there are incorrect and result in the auto-merge being executed in reverse, i.e. old code overwrites new code. The correct arguments are:

/m /t1=%6 /t2=%7 /t3=%8 /c=%9 %1 %3 %2 /r=%4