From 330329ef2baabf8dc5a2d7b1ae5ef432687b131c Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Mon, 7 Nov 2022 14:26:55 +0000
Subject: [PATCH] Replace ad hoc conflict markers with plugin

---
 plugin/autocmds.vim | 3 ---
 vimrc               | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugin/autocmds.vim b/plugin/autocmds.vim
index c8b64c3..a5cdfb1 100644
--- a/plugin/autocmds.vim
+++ b/plugin/autocmds.vim
@@ -12,9 +12,6 @@ augroup benieAugroup
   au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
           \ | exe "normal! g'\"" | endif
 
-  " Highlight conflict markers in any filetype
-  au FileType * call matchadd('Todo', '^\(<<<<<<<\s.*\||||||||\|=======\|>>>>>>>\s.*\)$')
-
   " Update `Last change: <date>` on write & go back previous cursor position
   au FileType help au BufWritePre <buffer>
         \ 1s/Last change: \zs.*$/\=strftime('%Y %b %d')/e|norm!``
diff --git a/vimrc b/vimrc
index 638f243..5bf2a7a 100644
--- a/vimrc
+++ b/vimrc
@@ -67,6 +67,8 @@ let g:ale_cmake_cmakelint_options =
 " Version control differences in the sign column
 Pack 'mhinz/vim-signify'
 let g:signify_sign_change = '~'
+" Conflict marker utilities
+Pack 'rhysd/conflict-marker.vim'
 
 " vim-textobj-user - library for creating text objects
 Pack 'kana/vim-textobj-user'