Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
A Vim plugin for managing three-way merges.
Python CSS VimL JavaScript
branch: master

Merge pull request #21 from killphi/fix_spliceinit_crash

Fixes several crash issues with the latest VIm versions
latest commit 4d322d8235
@sjl authored

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.

Something went wrong with that request. Please try again.