---

Ⅰ. 插件描述

Turns a CVS conflict file into a threeway diff

Ⅱ. 基本信息

创建日期：  2003-04-15 使用用户：  3 Github星：  2 插件作者：  Chris Rimmer

Ⅲ. 安装方法

使用Vundle管理器安装

在你的.vimrc下添加:

Plugin '/conflict2diff'

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

:source %
:PluginInstall

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

使用NeoBundle管理器安装

在你的.vimrc下添加:

NeoBundle '/conflict2diff'

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

:source %
:NeoBundleInstall

使用VimPlug管理器安装

在你的.vimrc下添加:

Plug '/conflict2diff'

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

:source %
:PlugInstall

使用Pathogen管理器安装

在终端中运行以下命令:

cd ~/.vim/bundle
git clone https://github.com/vim-scripts/Conflict2Diff

Ⅳ. 文档说明

This plugin splits a CVS conflict file into three diff windows.  The 2 conflicting versions of the file are put on the left and right.  The central window contains the file, with each conflicting area replaced by "=======".  Buffer specific mappings are set up to make the merging simple:

<Ctrl-Down> Move to the next conflict
<Ctrl-Up> Move to the previous conflict
<Ctrl-Left> Use the text from the lefthand file for this conflicting area
<Ctrl-Right> Use the text from the righthand file for this conflicting area
<Ctrl-q> Finish by closing the left and righthand windows, turning off diff and removing the mappings