Threesome - a Vim plugin for resolving three-way mergessjl.bitbucket.org2 points·basil··0 commentsOpen articleSaveView on HN