hg.stevelosh.com > splice.vim

README.markdown @ f0cdadaa3be0 

Set hidden.  No easy way around this.
author Steve Losh <steve@stevelosh.com>
date Fri, 01 Jul 2011 21:03:21 -0400
parents bbbc99908ae5
children 0013f7e01b6e 
Threesome
=========

Threesome is a Vim plugin for resolving conflicts during three-way merges.

Visit [the site](http://sjl.bitbucket.org/threesome.vim/) for more information.