Threesome is a project mainly written in PYTHON and VIM SCRIPT, based on the MIT license.
A plugin for resolving conflicts during three-way merges.
This is a mirror of http://www.vim.org/scripts/script.php?script_id=3721
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.
Go to the site for more information: http://sjl.bitbucket.org/threesome.vim/
Requirements: Vim 7.3+ with Python 2.5+ support.