您的位置：首页 > 其它

gvimdiff作为git的mergetool的配置文件(转载)

2013-04-13 13:28 405 查看
原文出处http://linuxtoy.org/archives/merging-with-git.html
编辑 ~/.gitconfig 文件

[merge]
tool = whatever_you_want
[mergetool "whatever_you_want"]


cmd = "gvim --noplugin --remote-tab-silent \"+set buftype=nowrite\"
\"$PWD/$MERGED\" && sleep 1;\
gvim --remote-send \":split $PWD/$REMOTE<CR>:set
buftype=nowrite<CR>:vertical diffsplit $PWD/$LOCAL<CR>:vertical diffsplit
$PWD/$BASE<CR>:set buftype=nowrite<CR><C-W>l\""
cmd = "gvim --noplugin \"$PWD/$MERGED\" \
+\":split $PWD/$REMOTE\" +\":set buftype=nowrite\" \
+\":vertical diffsplit $PWD/$LOCAL\" +\":set buftype=nowrite\" \
+\":vertical diffsplit $PWD/$BASE\" +\":set buftype=nowrite\" \
+\":wincmd l\""
cmd = "gvim --noplugin \"$PWD/$MERGED\" \
+\":split $PWD/$REMOTE\" +\":set buftype=nowrite\" \
+\":vertical diffsplit $PWD/$LOCAL\" +\":set buftype=nowrite\" \
+\":vertical diffsplit $PWD/$BASE\" +\":set buftype=nowrite\" \
+\":wincmd l\""
内容来自用户分享和网络整理，不保证内容的准确性，如有侵权内容，可联系管理员处理 点击这里给我发消息
标签： 
相关文章推荐
新的分享
章节导航