From 7ace0864582282af1d5ca3a543d5bdd6ba44b2f5 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Fri, 13 Apr 2018 23:23:31 +0100
Subject: [PATCH] Don't match non conflict markers

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

diff --git a/plugin/autocmds.vim b/plugin/autocmds.vim
index 7b4d267..8f66444 100644
--- a/plugin/autocmds.vim
+++ b/plugin/autocmds.vim
@@ -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