我正在尝试使用以下教程与 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 ...
请问哪里有梗?