Highlight merge conflict markers

4 Points
Dario Sneidermanis Dario Sneidermanis

10 years ago

Highlight merge conflict markers, and move through conflict markers with ]c and [c

" Highlight merge conflict markers
match Todo '\v^(\<|\=|\>){7}([^=].+)?$'

" Jump to next/previous merge conflict marker
nnoremap <silent> ]c /\v^(\<\|\=\|\>){7}([^=].+)?$<CR>
nnoremap <silent> [c ?\v^(\<\|\=\|\>){7}([^=].+)\?$<CR>