svn中使用diffmerge 代替 opendiff

opendiff 是OSX非常好用的合并工具,但是有个问题,不支持2M以上的大文件.而且打开速度不理想.

Google以后找到这个diffmerge速度很快, 不错

但是SVN支持有些问题,又找了个脚本.
[url]http://support.sourcegear.com/viewtopic.php?f=33&t=10044[/url]


注意脚本中的 15,16行,可能要修改为

VDIFF="diffmerge.sh"  
VDIFF3="diffmerge.sh"

下载回来后修改

mate ~/.subversion/config


将

diff-cmd = 
diff3-cmd = 

改成

diff-cmd = diffmerge-svn-wrapper.sh
diff3-cmd = diffmerge-svn-wrapper.sh

更新SVN时,出现冲突会提示
[quote]


What would you like to do?
[M]anual-merge [m]erge [A]ccept [I]gnore [D]efault [diff] [H]elp
[A]ccept Accept .r56011 and throw out local modifications
[D]efault Use diff3 to merge files (same behavior as vanilla SVN)
[Fail] Kills the command (not suggested)
[H]elp Print this message
[I]gnore Keep your locally modified version as is
[M]erge Manually merge using diffmerge.sh
[m]erge Same as M but attempts to automerge if possible
[R]evert Revert to base version (.r53161)
[S]ave Same as 'I' but writes out rold, rnew, and rmine files to deal with later
[diff] Type 'diff' to diff versions .mine and before making a descision
[diff3] Type 'diff3' to diff all three versions before making a descision
m
[/quote]


enjoy yourself!