如何在 SourceTree for Mercurial 中使用 Visual Studio (vsdiffmerge) 作为外部差异工具? [英] How to use Visual Studio (vsdiffmerge) as external diff tool in 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.0Common7IDEvsdiffmerge.exe"

差异参数:

"$LOCAL" "$REMOTE"//t

合并命令:

"C:Program Files (x86)Microsoft Visual Studio 12.0Common7IDEvsdiffmerge.exe"

合并参数:

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

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

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 Common7IDE subfolder. Visual Studio 2017 has it slightly more hidden. Look under Common7IDECommonExtensionsMicrosoftTeamFoundationTeam Explorer.


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

推荐答案

1. 你在命令和参数中有很多无用的(至少)黑斜线
2. 阅读设置Up 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

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