0e3a284792b2
Warning.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Mon, 13 Jun 2011 00:50:43 -0400 |
| parents | 0d5394864481 |
| children | 890a1d687c33 |
| branches/tags | (none) |
| files | README.markdown |
Changes
--- 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.