content/projects/threesome.html @ 1b76c3ae22eb

{% 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 %}