LinuxTOY

{撰文/vern}

编辑 ~/.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 = "vim --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\""

运行 git mergetool 后的截图

参考 merging-with-git

Read More:

• Murrine GTK2 Cairo Engine 0.50
• GIMP 2.4.2 发布
• VirtualBox 1.3.6 发布
• Deluge 0.5.7 发布