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

Question

我正在试图找出如何配置Visual 4与GIT一起使用Visual 2013。不管我如何配置它，它都希望使用VS2013内部diff/merge工具。

无与伦比安装目录

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

从吉特巴什窗口

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，但这也不起作用。任何帮助都将不胜感激！

Answer 1

实际上，我相信我在这篇文章Git Diff with Beyond Compare中找到了答案，到目前为止，这似乎是可行的。visual环境提供了新的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