hg.stevelosh.com > splice.vim

README.markdown @ 495ff793a490 

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