Revert "Merge pull request #25 from sybereal/fix/support-conflictmark…

…ersize"

because this change hits a bug of matchit.vim

This reverts commit e5ddd99, reversing
changes made to f3a26e8.

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

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)