怎么了选择
分类: LINUX
2012-12-12 15:00:57
在Ubuntu下,只需一条简单的命令就可以了
$:sudo apt-get install meld
在目录~/.subversions/下,新建脚本文件 mydiff.sh
内容如下:
#!/bin/sh
# Configure your favorite diff program here.
#"/usr/bin/bcompare
" DIFF="meld"
# DIFF="/usr/bin/meld"
# DIFF="/usr/bin/kompare"
# DIFF=env LANG=zh_CN.UTF-8 WINEPREFIX="/home/borqs/.wine" wine "C:\\Program Files\\Beyond Compare 2\\BC2.exe"
# Subversion provides the paths we need as the sixth and seventh
# parameters.
LEFT=${6}
RIGHT=${7}
# Call the diff command (change the following line to make sense for
# your merge program).
$DIFF $LEFT $RIGHT
# Return an errorcode of 0 if no differences were detected, 1 if some were.
# Any other errorcode will be treated as fatal.
return0
更改其可执行属性
$:chmod 777 ~/.subversion/mydiff.sh
让svn使用meld
编辑 "~/.subversion"目录下的"config"文件:
$gedit ~/.subversion/config
更改 diff-cmd:
diff-cmd =/home/kaigo/.subversion/mydiff.sh