content/projects/splice.html @ eb9bff72c935
Update a bit
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Fri, 24 Jul 2015 18:02:05 -0400 |
| parents | 25c804434023 |
| children | (none) |
{% extends "_post.html" %} {% hyde title: "Splice" snip: "A Vim plugin for resolving three-way merge conflicts." created: 2011-10-10 00:00:02 exclude: False %} {% block article %} [Splice](http://sjl.bitbucket.org/splice.vim/) is a Vim plugin that helps you resolve three-way merge conflicts. Check out the site for more information. {% endblock %}