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

visual-studio-2012 tfs diffmerge
Shaul Behr picture Shaul Behr · Jul 8, 2013 · Viewed 9.1k times · Source

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

Answer

Jeremy Thompson picture Jeremy Thompson · Aug 29, 2013

These are the SourceGear settings that I use:

C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe

Compare:

/t1=%6 /t2=%7 %1 %2

Merge:

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

Related questions

Error TF30063: You are not authorized to access ... \DefaultCollection

I'm using TFS Preview (Team Foundation Service) with one of my projects with Visual Studio 2012. I'm also using an on-premises TFS server with most of my projects. When I use my on-premises TFS after using TFS preview and go back …

Read More
Git in Visual Studio - add existing project?

I'm trying to put an existing project under Git source control, but I'm unclear on several things. I have set up a 'Team Foundation Service' Git account online. I currently have an ASP.NET MVC 4 solution - in my Projects …

Read More
How to update TFS workspace after computer name changes?

I renamed my computer name, and now my TFS workspace is broken in Visual Studio 2012. When I type: tf workspaces /computer:ABOTONJIC-PC /owner:* /format:detailed Workspace : ABOTONJIC-PC Owner : [email protected] Computer : ABOTONJIC-PC Comment : Collection : netuse.visualstudio.com\DefaultCollection Permissions: …

Read More