GitHub repository: sjl/splice.vim
Primary language: Python
Description: A Vim plugin for managing three-way merges.