25c804434023

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/projects/splice.html	Sun Sep 30 12:00:36 2012 -0400
@@ -0,0 +1,16 @@
+    {% 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 %}
+

--- a/content/projects/threesome.html	Sun Sep 30 01:31:40 2012 -0400
+++ b/content/projects/threesome.html	Sun Sep 30 12:00:36 2012 -0400
@@ -1,16 +1,15 @@
-{% extends "_post.html" %}
+    {% 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
-%}
+    {% hyde
+    title: "Threesome"
+    snip: "A Vim plugin for resolving three-way merge conflicts."
+    created: 2011-10-10 00:00:02
+    exclude: True
+    %}
 
-{% block article %}
+    {% 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.
+Threesome is now called [Splice](/projects/splice/).
 
-{% endblock %}
+    {% endblock %}