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	Thu, 30 Jun 2011 18:20:21 -0400
parents	bbbc99908ae5
children	0013f7e01b6e