Add syntax highlighting for merge conflict markers

salcode / ironcode-vim

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

9 stars 1 forks source link

Add syntax highlighting for merge conflict markers #219

Closed salcode closed 3 years ago

salcode commented 3 years ago

Note: We are using 'Error' as the syntax group name (see :help group-name) rather than some of the other choices we evaluated (e.g. 'Todo' and 'ErrorMsg') because the rendering is preferable with our colorscheme of choice (sjl/badwolf)

See https://github.com/salcode/ironcode-vim/issues/154#issuecomment-860192112

See #154

salcode / ironcode-vim

Add syntax highlighting for merge conflict markers #219

Before PR

After PR