VS 2012的TFS默认合并工具的命令行参数是什么? [英] What are the command line arguments for TFS default merge tool for VS 2012?

问题描述

我试图在VS(Tools -> Options, Select Source Control -> Visual Studio Team Foundation, Click Configure User Tools)中添加合并工具，以便可以运行diff并从命令行正确合并.除非我们添加这些设置，否则默认工具在VS编辑器中可以很好地工作，但不能在命令行中工作.

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.

我已经阅读了有关VS 2012提供的新合并工具的很多好处.该工具位于:

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.

推荐答案

根据Jehan提供的链接

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

但是，在上面的链接中，我注意到一条评论，提到对于VS2012，此人必须使用以下命令行才能使其正常工作:

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 =原始 ％2 =已修改 ％3 =基础 ％4 =已合并

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

P.S:我没有VS2012，也没有测试过.因此，不能担保答案，请进行测试，并让我知道它是否无效，这样可以帮助其他人寻找答案.

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.

这篇关于VS 2012的TFS默认合并工具的命令行参数是什么?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！