hg.stevelosh.com > splice.vim

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.
author	Steve Losh <steve@stevelosh.com>
date	Wed, 29 Jun 2011 18:20:10 -0400
parents	3908cdb23497
children	0013f7e01b6e