visual-studio-2012tfsdiffmerge

How to set up SourceGear DiffMerge as the diff/merge tool for Visual Studio?

I am using TFS for source control, but I want to use SourceGear DiffMerge for viewing file differences and doing merges. I found the Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Configure User Tools dialog, but setting up the merge parameters is very confusing. What should those parameters be?

enter image description here

Solution

  • Firstly, 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, 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