3f8f08e73be9
Add Fugitive notice.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Fri, 20 Apr 2012 15:24:31 +0100 |
parents | 0013f7e01b6e |
children | ade86d98b924 |
branches/tags | (none) |
files | README.markdown |
Changes
--- a/README.markdown Fri Apr 20 15:16:48 2012 +0100 +++ b/README.markdown Fri Apr 20 15:24:31 2012 +0100 @@ -1,8 +1,18 @@ 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.