__future__ize with
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Fri, 20 Apr 2012 15:30:17 +0100 |
| parents |
3f8f08e73be9 |
| children |
062b18eebd15 |
Splice
======
Splice is a Vim plugin for resolving conflicts during three-way merges.
Visit [the site](http://sjl.bitbucket.org/splice.vim/) 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.