hg.stevelosh.com > splice.vim

README.markdown @ e3cad92631fb 

Don't explode when running \n or \N when there are no conflicts left.
author Steve Losh <steve@stevelosh.com>
date Thu, 30 Jun 2011 18:16:06 -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.