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	Raphaël Proust <raphlalou@gmail.com>
date	Thu, 03 Nov 2011 14:35:09 +0000
parents	bbbc99908ae5
children	0013f7e01b6e