From 1e47926465ecdb77326a1d3334a4b573d0e8bbc9 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Wed, 24 Jul 2019 13:52:17 +0100
Subject: [PATCH] Don't add conflict marker highlight in help files

---
 plugin/autocmds.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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: <date>` on write & go back previous cursor position
   au FileType help au BufWritePre <buffer>