Rhysd/conflict-marker.vim: Weapon to fight against conflicts in Vimgithub.com/rhysd1 pointtambourine_man4 years ago