如何将Visual Studio(vsdiffmerge)用作SourceTree for Mercurial中的外部差异工具?

问题描述

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

I am using Mercurial for my source control and SourceTree to manage it. I want to use Visual Studio's built in diff and merge tool (vsdiffmerge) for comparing files however this is not working.

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

I am currently using the following:

差异命令:

\"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差异工具.你能看看吗?

The Visual Studio diff tool is not getting launched. Could you please take a look?

更新:-

   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

推荐答案

1. 您在命令和参数中使用了很多(至少)无用的斜杠
2. 阅读设置进入DiffMerge 页，第二章并解决自己的错误

1. You have a lot of useless (at least) blackslashes in commands and arguments
2. Read Setting Up DiffMerge page, second chapter and fix own mistakes

这篇关于如何将Visual Studio(vsdiffmerge)用作SourceTree for Mercurial中的外部差异工具?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！