search

tomtom / quickfixsigns_vim

Mark quickfix & location list items with signs
http://www.vim.org/scripts/script.php?script_id=2584
GNU General Public License v3.0
131 stars 13 forks source link

plugin to mark VCS merge conflicts #63

Closed noscript closed 8 years ago

noscript commented 8 years ago

This plugin adds signs for merge conflicts produced by VCS like Git.

Screenshot: conflict