hg.stevelosh.com > splice.vim

README.markdown @ bbc5193de145 

Fix conflict marker regexes.
author Steve Losh <steve@stevelosh.com>
date Thu, 03 Nov 2011 11:15:10 -0400
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.