From 0e9686f3c8a0922d0a4c774024705e805a9307f7 Mon Sep 17 00:00:00 2001 From: rhysd Date: Mon, 20 May 2024 03:32:29 +0900 Subject: [PATCH] Revert "Merge pull request #25 from sybereal/fix/support-conflictmarkersize" because this change hits a bug of matchit.vim This reverts commit e5ddd99dad5d1d8977f71cdf46b8e704932a8c33, reversing changes made to f3a26e8951648711054fd1c76b0166b0ff3af6cd. --- README.md | 7 +++---- plugin/conflict_marker.vim | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 38df0cb..27fb617 100644 --- a/README.md +++ b/README.md @@ -94,10 +94,9 @@ 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, common ancestor, and end markers -let g:conflict_marker_begin = '^<\{7,} .*$' -let g:conflict_marker_common_ancestors = '^|\{7,} .*$' -let g:conflict_marker_end = '^>\{7,} .*$' +" Include text after begin and end markers +let g:conflict_marker_begin = '^<<<<<<< .*$' +let g:conflict_marker_end = '^>>>>>>> .*$' highlight ConflictMarkerBegin guibg=#2f7366 highlight ConflictMarkerOurs guibg=#2e5049 diff --git a/plugin/conflict_marker.vim b/plugin/conflict_marker.vim index 4f9868d..d8e1d80 100644 --- 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', '^<\{7,}') -call s:var('common_ancestors', '^|\{7,}') -call s:var('separator', '^=\{7,}$') -call s:var('end', '^>\{7,}') +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)