hg.stevelosh.com > splice.vim

README.markdown @ b4b887219024 

Added information on using threesome with Bazaar to website.
author A. S. Budden <abudden@gmail.com>
date Mon, 19 Sep 2011 13:11:05 +0100
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.