---

Ⅰ. 插件描述

A Vim plugin for managing three-way merges.

Ⅱ. 基本信息

创建日期：  2011-06-13 使用用户：  190 Github星：  235 插件作者：  Steve Losh

Ⅲ. 安装方法

使用Vundle管理器安装

在你的.vimrc下添加:

Plugin 'sjl/splice'

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

:source %
:PluginInstall

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

使用NeoBundle管理器安装

在你的.vimrc下添加:

NeoBundle 'sjl/splice'

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

:source %
:NeoBundleInstall

使用VimPlug管理器安装

在你的.vimrc下添加:

Plug 'sjl/splice'

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

:source %
:PlugInstall

使用Pathogen管理器安装

在终端中运行以下命令:

cd ~/.vim/bundle
git clone https://github.com/sjl/splice.vim

Ⅳ. 文档说明

Splice

Splice is a Vim plugin for resolving conflicts during three-way merges.

Visit the site for more information.

Troubleshooting

Splice and Fugitive do not play well together. If you try to use Splice as
a git mergetool while you have Fugitive installed it may segfault Vim, even if
you're not using any Fugitive features.

Fugitive must be doing something behind the scenes even when you don't run any
of its commands, but unfortunately the segfault doesn't give me a useful trace
so I can find the issue. If you have any ideas on what might be happening
please let me know -- I'd love to fix this.