content/projects/splice.html @ 34ae2ee96a63

Two space entry.
author Steve Losh <steve@stevelosh.com>
date Fri, 12 Oct 2012 09:48:08 -0400
parents 25c804434023
children (none)
    {% extends "_post.html" %}

    {% hyde
    title: "Splice"
    snip: "A Vim plugin for resolving three-way merge conflicts."
    created: 2011-10-10 00:00:02
    exclude: False
    %}

    {% block article %}

[Splice](http://sjl.bitbucket.org/splice.vim/) is a Vim plugin that helps
you resolve three-way merge conflicts.  Check out the site for more information. 

    {% endblock %}