diff --git a/plugin/autocmds.vim b/plugin/autocmds.vim index 5dcdcfa..f55c310 100644 --- a/plugin/autocmds.vim +++ b/plugin/autocmds.vim @@ -6,7 +6,7 @@ augroup benieAugroup \ | exe "normal! g'\"" | endif " Highlight conflict markers in any filetype - au FileType * call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\s\ze.*$') + au FileType * call matchadd('Todo', '^\(<<<<<<<\s.*\||||||||\|=======\|>>>>>>>\s.*\)$') " Update `Last change: ` on write & go back previous cursor position au FileType help au BufWritePre