一   首先下载正版的Beyond Compare 地址https://www.scootersoftware.com/download.php

二   如果bin文件夹下没有bcomp,打开终端命令,执行以下命令,在bin文件夹下创建bcomp:

ln -s /Applications/Beyond\ Compare.app/Contents/MacOS/bcomp /usr/local/bin/

三   如果您安装好的应用程序在“下载”文件中,那么把它拖进“应用程序”中。

Mac SourceTree配置Beyond Compare

四   打开SourceTree的Preferences选项,在Diff选项下进行一下设置:

Visual Diff Tool: Custom...

Diff Command: /usr/local/bin/bcomp

Arguments: $LOCAL $REMOTE


Merge Tool: Custom...
Merge Command: /usr/local/bin/bcomp


Arguments: $LOCAL $REMOTE $BASE $MERGED


 Mac SourceTree配置Beyond Compare

Mac SourceTree配置Beyond Compare

五    点击关闭选项按钮,重新启动SourceTree

六    找到有冲突的文件,右键打开Resolve Conflicts 下的Launch External Merge Tool

Mac SourceTree配置Beyond Compare

Mac SourceTree配置Beyond Compare

这样,对比工具就设置好了~~

相关文章: