Vim:尝试在git中进行三向合并时,不能超过4个缓冲区

时间:2013-03-24 13:53:55

标签: git vim

我正在尝试使用以下教程与git和vim进行三种合并:http://www.toofishes.net/blog/three-way-merging-git-using-vim/但我的Vim总是给我:

Can not diff more than 4 buffers

它以奇怪的状态开始,有五个窗口(第一个是空的)。我尝试使用-U NONE选项启动它以禁用我的所有设置,但它始终是相同的。我确实想要从图片中设置(底部的合并文件,上面的三个窗格)。

git config --global mergetool.vimdiff3.cmd 'vim -f -d -c "wincmd J" "$MERGED" "$LOCAL" "$BASE" "$REMOTE"'
git config --global merge.tool vimdiff3
... making a conflict with git ...
git mergetool
... vim is starting ...
Vim shows: Can not diff more than 4 buffers
... hitting ENTER hides the error and I see scrambled windows ...

请问哪里有障碍?

0 个答案:

没有答案