Skip to content
A Vim plugin for managing three-way merges.
Python Vim script Makefile Shell
Branch: master
Clone or download

Latest commit

Fetching latest commit…
Cannot retrieve the latest commit at this time.

Files

Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
autoload Plugin should work with Python 2 and 3 now. Mar 5, 2015
doc Phrasing Jan 15, 2020
plugin Rename to Splice, and change default prefix. Apr 20, 2012
site Update URLs Jan 15, 2020
syntax Rename to Splice, and change default prefix. Apr 20, 2012
.ffignore Switch the site to use d Oct 8, 2016
.gitignore Add a .gitignore. Jun 30, 2011
.hgignore Add site/build to .hgignore. Oct 8, 2016
.hgtags Added tag v1.1.0 for changeset 61fde9091c13 Oct 8, 2016
LICENSE.markdown Rename to Splice, and change default prefix. Apr 20, 2012
Makefile Update URLs Dec 23, 2019
README.markdown Update URLs Dec 23, 2019
package.sh

README.markdown

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.

You can’t perform that action at this time.