svn和git使用vimdiff比較文件

svn使用vimdiff比較文件

$ cat /usr/local/bin/my_diff_tool.sh 
#!/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

# Return an errorcode of 0 if no differences were detected, 1 if some were.
# Any other errorcode will be treated as fatal.

而後在~/.subversion/config 文件中的 [helpers] 欄下面添加：

diff-cmd = /usr/local/bin/my_diff_tool.sh

如今能夠使用svn diff file 參看文件的修改位置了。

具體參看：更換svn diff爲vimdiff

git 使用vimdiff比較文件：

$ git config --global diff.tool vimdiff
$ git config --global merge.tool vimdiff
$ git config --global difftool.prompt false

而後使用git difftool file就能夠參看文件的修改位置了。

具體參看：Git and Vimdiff

上面都是使用命令行比較文件的修改位置，跟使用emacs作比較有區別。另外研究。