revert 0e9686f without using , in marker patterns to avoid matchit.…

…vim bug

Co-authored-by: Simon Engmann <simon.engmann@sovity.de>

README.md

@@ -95,8 +95,9 @@ group, and define your own highlights for each syntax group.
 let g:conflict_marker_highlight_group = ''
 
 " Include text after begin and end markers
-let g:conflict_marker_begin = '^<<<<<<< .*$'
-let g:conflict_marker_end = '^>>>>>>> .*$'
+let g:conflict_marker_begin = '^<<<<<<<\+ .*$'
+let g:conflict_marker_common_ancestors = '^|||||||\+ .*$'
+let g:conflict_marker_end = '^>>>>>>>\+ .*$'
 
 highlight ConflictMarkerBegin guibg=#2f7366
 highlight ConflictMarkerOurs guibg=#2e5049

plugin/conflict_marker.vim

@@ -10,10 +10,10 @@ function! s:var(name, default)
 endfunction
 
 call s:var('highlight_group', 'Error')
-call s:var('begin', '^<<<<<<<')
-call s:var('common_ancestors', '^|||||||')
-call s:var('separator', '^=======$')
-call s:var('end', '^>>>>>>>')
+call s:var('begin', '^<<<<<<<\+')
+call s:var('common_ancestors', '^|||||||\+')
+call s:var('separator', '^=======\+$')
+call s:var('end', '^>>>>>>>\+')
 call s:var('enable_mappings', 1)
 call s:var('enable_hooks', 1)
 call s:var('enable_highlight', 1)