Screencast: Demo of Threesome, a 3-way merge plugin for Vim (work-in-progress) (vimeo.com)

Oh, great!

One of the best vim plugin interfaces i've seen yet :). This merits a plus. Thinking of using it right away, even if it is not already stable.