content/projects/threesome.html @ 077d26243aa1
Remove Forrst link, replace Flickr with 500px.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Sat, 29 Sep 2012 11:31:05 -0400 |
| parents | d0651ea8718f |
| 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 %}