Replace ad hoc conflict markers with plugin

2022-11-07 14:26:55 +00:00
parent 32610db521
commit 330329ef2b
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@@ -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'