---

Ⅰ. 插件描述

Easy window re-arrangement in vimdiff when resolving a merge conflict

Ⅱ. 基本信息

创建日期：  2012-07-20 使用用户：  1 Github星：  6 插件作者：  Tye McQueen

Ⅲ. 安装方法

使用Vundle管理器安装

在你的.vimrc下添加:

Plugin 'tyemcqueen/vim-merge-windows'

… 然后在Vim中运行以下命令:

:source %
:PluginInstall

对于Vundle版本 < 0.10.2，请用上面的Bundle替换Plugin。

使用NeoBundle管理器安装

在你的.vimrc下添加:

NeoBundle 'tyemcqueen/vim-merge-windows'

… 然后在Vim中运行以下命令:

:source %
:NeoBundleInstall

使用VimPlug管理器安装

在你的.vimrc下添加:

Plug 'tyemcqueen/vim-merge-windows'

… 然后在Vim中运行以下命令:

:source %
:PlugInstall

使用Pathogen管理器安装

在终端中运行以下命令:

cd ~/.vim/bundle
git clone https://github.com/tyemcqueen/vim-merge-windows

Ⅳ. 文档说明

When using "vimdiff" to resolve a merge conflict, vim-merge-windows makes it
trivial to control the presentation of the windows for the different instances
of the conflicted file (the Merged end result, the Local version, the Remote
version, and the Base version of the file). That is, you can pick which
windows to show, in what order, and which ones are being 'diff'ed and quickly
change between arrangements.

vim-merge-windows also includes a small Perl script, pdiff, that allows one
to use git's implementation of "patience diff" as the diff engine for vimdiff.
This can make a 'diff' much more useful by preventing it from deciding
that the important thing is how the blank lines line up together.

vim-merge-windows is a small, self-contained utility that is very light-weight
and easy to add to vim. It currently is targetted only toward being used
from git-mergetool but it should be easy to extend to support other conventions
and so such support will likely be added in future.

The following optional (but standard) features of vim are required:

+diff
+eval
+folding (not strictly required)
+listcmds
+vertsplit
+windows

It is implemented as a single command, :M, that uses a single function,
MergeWindows, which is written in vimscript (so no non-default embedded
language is required).

No key bindings are set by default so you don't have to worry about it
messing up any of your custom key bindings. The :M command is so simple and
terse to use, you might never decide to make your own, shorter key bindings.

A short sample of things you can do with the :M command:

:M mlbr     # Show Merged, Local, Base, Remote in that order
:M lb       # Show just Local and Base, diff'ing them
:M Mrb      # Show Merge, Local, Base but only diff'ing Local, Base
:M b        # Jump to the Base window (making it appear, if hidden)
:M M        # Show only Merged
:M -        # Hide the current window
:M =        # Turn off "diff" for the current window
:M +        # Turn on "diff" for the current window
:M -b       # Hide the Base window
:M 9        # Move the current window to the far right
:M 2        # Move the current window to 2nd-from-the-left
:M +m8      # Move/show Merged to be 2nd-from-right, turning on 'diff'
:M -b+m2r9  # Do ":M -b", ":M +m2", and ":M +r9"

See INSTALL.text for installation instructions.

See Usage.text for more details about vim-merge-windows.