svn中的diff可以用vimdiff来代替
vimdiff是个很神奇的工具,用来看文件diff比diff程序直观太多了。
svn中查看diff的时候,也可以使用vimdiff用作diff program。
首先要写个脚本包装一下vimdiff:
#!/bin/sh
# Configure your favorite diff program here.
DIFF="/usr/bin/vimdiff"
# 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
假设保存为/home/dongliu/mydiff,加上可执行权限,
chmod +x/home/dongliu/diffwrap
然后 修改~/.subversion/config文件中的配置,更改helpers下的diff程序配置:
[helpers]
diff-cmd = /home/dongliu/diffwrap
就可以在svn中使用vimdiff了。
