用 gvim 比较 git diff

for Windows

参考 [https://gist.github.com/502217 gist:502217]

  1. 在用户目录下的 .gitconfig 中加入:

    [diff] external = git\ndiff\nwrapper.bat [pager] diff =

  2. 创建 git\ndiff\nwrapper.bat 文件放到 \nPATH 目录下,内容为:

    path\to\gvim.exe \nd "%2" "%5"

    gvim \nd "\n2" "\n5"

    注意其中的 path\to\ 要改为 gvim.exe 所在目录。

for Linux

参考 Git Diff with Vimdiff