hg.stevelosh.com > stevelosh.com

content/projects/threesome.html @ d6bebd8d9778 

Link my .plan
author Steve Losh <steve@stevelosh.com>
date Mon, 27 Jun 2016 15:25:34 +0000
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 %}