content/projects/threesome.html @ d0651ea8718f

Holy shit I updated my site.
author Steve Losh <steve@stevelosh.com>
date Mon, 10 Oct 2011 00:45:29 -0400
parents (none)
children 25c804434023
{% extends "_post.html" %}

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

{% block article %}

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

{% endblock %}