A Vim plugin for managing three-way merges. - View it on GitHub