hg.stevelosh.com > splice.vim

README.markdown @ b8aab52392ea v0.2.0 

Add threesome_leader config option.
author Steve Losh <steve@stevelosh.com>
date Fri, 02 Sep 2011 09:52:05 -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.