GitHub repository: rhysd/conflict-marker.vim
Primary language: Vim Script
Description: Weapon to fight against conflicts in Vim.