MAC 配置svn比较工具diffmerge

参考文https://semicrazy.wordpress.com/2009/10/08/using-diffmerge-as-your-subversion-external-merge-tool/

1. 准备2个sh文件供svn调用

~/scripts/diffmerge/diffmerge-svndiff.sh:

~/scripts/diffmerge/diffmerge-svnmerge.sh:

参考样例：

merge:

#!/bin/bash
DIFFMERGE_PATH=/Applications/DiffMerge/DiffMerge.app
DIFFMERGE_EXEC=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge
# svn will invoke this with a bunch of arguments.  These are:
# $1 - path to the file that is the original
# $2 - path to the file that's the incoming merge version
# $3 - path to the file that's the latest from trunk (current working copy)
# $4 - path to where svn expects the merged output to be written
${DIFFMERGE_EXEC} --nosplash -m -t1="Incoming Merge Changes"  -t2="Original (merged)" -t3="Current Working Copy changes" -r="$4" "$2" "$1" "$3"

diff 主要就是参数不同:

${DIFFMERGE_EXEC}  -u -t1="$3"  -t2="$5" $6 $7

设置svn配置文件(.subversion/config)：

diff-cmd = /Users/xxxx/scripts/diffmerge/diffmerge-svndiff.sh
merge-tool-cmd = /Users/xxx/scripts/diffmerge/diffmerge-svnmerge.sh