config/vim
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Don't match non conflict markers

Browse Source
This commit is contained in:
Kenneth Benzie 2018-04-13 23:23:31 +01:00
parent 5391645629
commit 7ace086458
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/autocmds.vim
View File

@ -11,5 +11,5 @@ augroup benieAugroup
au BufRead,BufNewFile .out set filetype=zsh
" Highlight conflict markers in any filefile
au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\s\ze.*$')
augroup END