如何在SourceTree for Mercurial中使用Visual Studio(vsdiffmerge)作为外部差异工具？

Question

我使用Mercurial进行源代码控制,使用SourceTree进行管理.我想使用Visual Studio的内置差异和合并工具(vsdiffmerge)来比较文件,但是这不起作用.

我目前正在使用以下内容:

差异命令:

\"C:\ Program Files(x86)\ Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exe \"

差异参数:

\"$ LOCAL \"\"$ REMOTE \"// t

合并命令:

\"C:\ Program Files(x86)\ Microsoft Visual Studio 12.0\Common7\IDE\vsdiffmerge.exe \"

合并参数:

\"$ REMOTE \"\"$ LOCAL \"\"$ BASE \"\"$ MERGED \"// m

Visual Studio diff工具未启动.你能看一下吗？

更新: -

   We should use like below:-
   Diff Command: 
   full path of vsDiffMerge.exe
   For VS 2015 and below you can find it in the Visual Studio installation folder, under Common7\IDE subfolder. Visual Studio 2017 has it slightly more hidden. Look under Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer.


   Diff Argument: "$LOCAL" "$REMOTE" "Source" "Target" //t
   Merge Argument: $LOCAL" "$REMOTE" "$BASE" "$MERGED" //m

谢谢,Sombir

Answer 1

对于 Visual Studio 2019 EnterprisevsDiffMerge.exe位置是：

C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe

Answer 2

对于Visual Studio 2015

将此行放在Diff Command框中:

C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsDiffMerge.exe

在参数框中这一个:

$REMOTE $LOCAL $BASE $MERGED //m

Answer 3

1. 您在命令和参数中有很多无用（至少）的斜杠
2. 阅读设置DiffMerge页面，第二章并解决自己的错误

Answer 4

使用Visual Studio 2015 Update 1和SourceTree 1.7.0.32509这只是设置,这对我有用:

C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsDiffMerge.exe 
$REMOTE $LOCAL $BASE $MERGED //m