hg.stevelosh.com > stevelosh.com

content/projects/threesome.html @ 56490526347a 

Merge.
author Steve Losh <steve@stevelosh.com>
date Sat, 30 Mar 2013 14:10:03 -0400
parents 25c804434023
children (none) 
    {% extends "_post.html" %}

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

    {% block article %}

Threesome is now called [Splice](/projects/splice/).

    {% endblock %}