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