CODEWITHSUNDEEP
visual-studiovisual-studio-2012tfsmerge
raleign
raleign

Reputation: 113

What are the command line arguments for TFS default merge tool for VS 2012?

I am trying to add a merge tool in VS (Tools -> Options, Select Source Control -> Visual Studio Team Foundation, Click Configure User Tools), so that I can run the diff and merge correctly from the command line. The default tool works great from the VS editor, but not the command line, unless we add these settings.

I have read a lot of good things about the new merge tool provided by VS 2012. The tool is located at:

C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\vsDiffMerge.exe

But I can't seem to get the command line arguments right.

Upvotes: 4

Views: 7576

Answers (2)

Jehan33
Jehan33

Reputation: 3780

Please check below post which explains about vsDiffMerge.exe commands.

http://roadtoalm.com/2013/10/22/use-visual-studio-as-your-diff-and-merging-tool-for-local-files/

Upvotes: 1

Isaiah4110
Isaiah4110

Reputation: 10090

As per the links provided by Jehan LINK1 and the information LINK2, the command line should be this:

C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\vsDiffMerge.exe
%1 %2 %3 %4 /m /t

However in the link above I noticed a comment mentioning that for VS2012, the person had to use the below command line to get it working:

C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\vsDiffMerge.exe
/t /m %1 %2 %3 %3 %3 %4

%1 = original %2 = modified %3 = base %4 = merged

P.S: I dont have VS2012 and have not tested this. So cannot vouch for the answer, please test and let me know if it doesnt work so that it will help other people looking for the answer.

Upvotes: 4

Related Questions