Merge pull request #25 from sybereal/fix/support-conflictmarkersize

Support conflict-marker-size larger than 7
rhysd · May 19, 2024 · e5ddd99 · e5ddd99
2 parents f3a26e8 + 63a0a5b
commit e5ddd99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -94,9 +94,10 @@ group, and define your own highlights for each syntax group.
 " disable the default highlight group
 let g:conflict_marker_highlight_group = ''
 
-" Include text after begin and end markers
-let g:conflict_marker_begin = '^<<<<<<< .*$'
-let g:conflict_marker_end   = '^>>>>>>> .*$'
+" Include text after begin, common ancestor, and end markers
+let g:conflict_marker_begin = '^<\{7,} .*$'
+let g:conflict_marker_common_ancestors = '^|\{7,} .*$'
+let g:conflict_marker_end   = '^>\{7,} .*$'
 
 highlight ConflictMarkerBegin guibg=#2f7366
 highlight ConflictMarkerOurs guibg=#2e5049

diff --git a/plugin/conflict_marker.vim b/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', '^<\{7,}')
+call s:var('common_ancestors', '^|\{7,}')
+call s:var('separator', '^=\{7,}$')
+call s:var('end', '^>\{7,}')
 call s:var('enable_mappings', 1)
 call s:var('enable_hooks', 1)
 call s:var('enable_highlight', 1)