A Vim plugin for managing three-way merges.
Python Vim script Makefile Shell
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
autoload
doc
plugin
site
syntax
.ffignore
.gitignore
.hgignore
.hgtags
LICENSE.markdown
Makefile
README.markdown
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.