Move through Git conflict markers with ]c amd [c

salcode / ironcode-vim

A Vim Configuration focused on WordPress development and predominantly used on a Mac with Neovim

9 stars 1 forks source link

Move through Git conflict markers with ]c amd [c #218

Closed salcode closed 3 years ago

salcode commented 3 years ago

This issue was spun off from #154

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

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

From vimrcfu 177

salcode commented 3 years ago

Resolved in #220