# HG changeset patch # User Steve Losh # Date 1307940643 14400 # Node ID 0e3a284792b2bc1e027c0a8c87abe8afd2104d05 # Parent 0d5394864481ad1b46a9cede05812dc699e543ff Warning. diff -r 0d5394864481 -r 0e3a284792b2 README.markdown --- a/README.markdown Mon Jun 13 00:47:04 2011 -0400 +++ b/README.markdown Mon Jun 13 00:50:43 2011 -0400 @@ -1,3 +1,15 @@ +This plugin is still under active development. +============================================== + +It is not even remotely ready yet. +================================== + +It will probably eat your data. +=============================== + +Seriously. If you use it and complain about it eating your data I am going to make fun of you on Twitter. +====================== + Threesome is a Vim plugin for resolving conflicts during three-way merges. It's designed to be used as a merge tool for version control systems like Mercurial and Git.