Splice 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.