Splice is a Vim plugin for resolving three-way merges. It's inspired by Adobe Lightroom's user interface. Watch the demo screencast in HD on Vimeo to get an idea of how it works.
:help splice