D:\Program Files\Beyond Compare 3\BCompare.exe
git config --global diff.tool bc3
git config --global difftool.bc3.path "D:/Program Files/Beyond Compare 3/BCompare.exe"
git config --global merge.tool bc3
git config --global mergetool.bc3.path "D:/Program Files/Beyond Compare 3/BCompare.exe"
diff 和vim 设置
git difftool --tool=vimdiff --no-prompt
git config --global diff.tool vimdiff
git config --global merge.tool vimdiff
git config --global difftool.prompt false