source tree 配置 外部差异比对工具为beyond compare

来源:互联网 发布:xquartz for mac下载 编辑:程序博客网 时间:2024/05/18 02:45

1、首先,安装好beyond compare后,创建一个快捷方式
ln -s /Applications/Beyond\ Compare.app/Contents/MacOS/bcomp /usr/local/bin/

2、打开source tree,在系统偏好设置里面,找到diff,按照下面的进行配置:

Visual Diff Tool: OtherDiff Command:/usr/local/bin/bcompParameters:-ro $LOCAL $REMOTEMerge Tool: OtherMerge Command:/usr/local/bin/bcompParameters:$LOCAL $REMOTE $BASE $MERGED
0 0