Mercurial > hg > mhoward > dotfiles / changeset

• changeset
• raw
• gz

changeset

fix conflict marker hl

Tue, 03 Dec 2019 12:53:50 -0600

author

Meredith Howard <mhoward@roomag.org>

date

Tue, 03 Dec 2019 12:53:50 -0600

changeset 836

2f0a718712d1

parent 835

49826fe1c850

child 837

b3e5b49e29c3

fix conflict marker hl

--- a/.vimrc
+++ b/.vimrc
@@ -279,8 +279,7 @@ augroup vimrc
 
   " Simple highlight conflict markers
   autocmd BufReadPost *
-    \ syn match Error "^\(<\|>\||\)\1\{6,7}" |
-    \ syn match Error "^=\{7,8}$"
+    \ match Error "^\([<>|]\)\{7} \@=\|^=\{7}$"
 
   " Simplify noisy ltag output
   autocmd BufReadPost quickfix