使用 Git 时在 Visual Studio 2013 中设置 Beyond Compare 4答案

【问题标题】：Setting up Beyond Compare 4 in Visual Studio 2013 when using Git使用 Git 时在 Visual Studio 2013 中设置 Beyond Compare 4
【发布时间】：2014-06-06 15:32:38
【问题描述】：

我试图弄清楚如何配置 BEYOND COMPARE 4 以与带有 GIT 的 Visual Studio 2013 一起使用。无论我如何配置它，它都想使用 VS2013 内部差异/合并工具。

除了比较安装目录

C:\Program Files (x86)\Beyond Compare 4

来自 git bash 窗口

Microsoft Windows [Version 6.1.7601]
Copyright (c) 2009 Microsoft Corporation.  All rights reserved.

C:\Users\me>git --version
git version 1.8.3.msysgit.0

C:\Users\me>git config --list
core.symlinks=false
core.autocrlf=true
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
pack.packsizelimit=2g
help.format=html
http.sslcainfo=/bin/curl-ca-bundle.crt
sendemail.smtpserver=/bin/msmtp.exe
rebase.autosquash=true
diff.tool=bc4
difftool.bc4.path=C:\Program Files (x86)\Beyond Compare 4\BComp.exe
merge.tool=bc4
mergetool.bc4.path=C:\Program Files (x86)\Beyond Compare 4\BComp.exe
core.editor="C:/Program Files (x86)/GitExtensions/GitExtensions.exe" fileeditor
core.autocrlf=true
credential.helper=!\"C:/Program Files (x86)/GitExtensions/GitCredentialWinStore/
git-credential-winstore.exe\"
user.name=me
user.email=me@email.com
gui.recentrepo=C:/DevSource/mercury

C:\Users\me>

git install /etc目录下的全局gitcoinfig

[core]
    symlinks = false
    autocrlf = true
[color]
    diff = auto
    status = auto
    branch = auto
    interactive = true
[pack]
    packSizeLimit = 2g
[help]
    format = html
[http]
    sslCAinfo = /bin/curl-ca-bundle.crt
[sendemail]
    smtpserver = /bin/msmtp.exe

[rebase]
    autosquash = true
[diff]
    tool = bc4
[difftool "bc4"]
    path = C:\\Program Files (x86)\\Beyond Compare 4\\BComp.exe
[merge]
    tool = bc4
[mergetool "bc4"]
    path = C:\\Program Files (x86)\\Beyond Compare 4\\BComp.exe

还尝试将 exe 更改为 BCompare.exe 而不是 BComp.exe，但这也不起作用。任何帮助将不胜感激！

【问题讨论】：

运行git mergetool会得到什么？

标签： git visual-studio-2013 beyondcompare

【解决方案1】：

其实我相信我在这篇文章中找到了答案 Git Diff with Beyond Compare 到目前为止似乎有效。 Visual Studio 环境带来了新的 BC4.0 IDE，而不是内部工具。

[diff]
    tool = bc4
[difftool "bc4"]
    cmd = \"c:/program files (x86)/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = bc4
[mergetool "bc4"]
    cmd = \"c:/program files (x86)/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
    trustExitCode = true

【讨论】：