# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1575399230 21600
# Node ID 2f0a718712d1ead5613042c3eb58078825c56aaa
# Parent  49826fe1c8504842897b18ee7ef02a31a1d0dffa
fix conflict marker hl

diff --git a/.vimrc b/.vimrc
--- 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