From fe197a4c76328a24dd13a41bb4dec37f5b2b1b03 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Thu, 29 Mar 2018 21:22:26 +0100
Subject: [PATCH] Add conflict marker highlights as TODO's

For all filetype's highlight conflict markers with the Todo highlight
group and leave trailing text as before. This makes conflict markers
very obvious, in C/C++ where I have operator highlighting conflict
markers are not longer highlighted as operators.
---
 plugin/autocmds.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin/autocmds.vim b/plugin/autocmds.vim
index a6df3ba..7b4d267 100644
--- a/plugin/autocmds.vim
+++ b/plugin/autocmds.vim
@@ -9,4 +9,7 @@ augroup benieAugroup
   " TODO: Move this to a plugin & rename to .enter .exit
   au BufRead,BufNewFile .env set filetype=zsh
   au BufRead,BufNewFile .out set filetype=zsh
+
+  " Highlight conflict markers in any filefile
+  au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
 augroup END