SourceTree中使用BeyondCompare配置方法:
使用everything工具全局搜索.gitconfig文件(正常都在C:\Users\{用户名}下)
打开文件后一般显示如下:
[difftool "sourcetree"]
cmd = '' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = "'' "
trustExitCode = true
[core]
excludesfile = C:\\Users\\EDZ\\Documents\\gitignore_global.txt
[user]
name = *****账号
email = ****邮箱
在其后添加如下代码(注意修改自己的BeyondCompare路径):
# add beyondcompare
[diff]
tool = bc4
[difftool]
prompt = true
[difftool "bc4"]
cmd = "\"D:\\soft\\Beyond Compare 4\\Beyond Compare 4\\BCompare.exe\" \"$(cygpath -w $LOCAL)\" \"$REMOTE\""
[merge]
tool = bc4
[mergetool]
prompt = true
[mergetool "bc4"]
#trustExitCode = true
cmd = "\"D:\\soft\\Beyond Compare 4\\Beyond Compare 4\\BCompare.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
#end add
修改如下:
至此SourceTree中即可使用BeyondCompare。
VS中使用BeyondCompare配置方法如下:
打开工程目录下
打开正常显示如下:
在其后添加如下代码(注意修改自己的BeyondCompare路径):
[diff]
tool = bc4
[difftool "bc4"]
cmd = "\"D:\\soft\\Beyond Compare 4\\Beyond Compare 4\\BCompare.exe\" \"$LOCAL\" \"$REMOTE\""
[merge]
tool = bc4
[mergetool "bc4"]
cmd = "\"D:\\soft\\Beyond Compare 4\\Beyond Compare 4\\BCompare.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\""
修改结果如下:
至此VS也可以使用BeyondCmpare了。