svn和git使用vimdiff比较文件

2019独角兽企业重金招聘Python工程师标准>>>

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做比较有区别。另外研究。

转载于:https://my.oschina.net/u/191928/blog/688728