hg.stevelosh.com > splice.vim

README.markdown @ e74f19c88d7e 

Added tag v0.1.1 for changeset 17831680bc89
author Steve Losh <steve@stevelosh.com>
date Fri, 02 Sep 2011 09:36:27 -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.