# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1334931871 -3600
# Node ID 3f8f08e73be9ec7f17d84fdf1cfec62ecc69a5f1
# Parent  0013f7e01b6e834bd72a3e2f3cf818680c61d982
Add Fugitive notice.

diff -r 0013f7e01b6e -r 3f8f08e73be9 README.markdown
--- 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.