Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Doc updates and change default g:conflict_marker_common_ancestors #20

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Doc updates and change default g:conflict_marker_common_ancestors #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
562514d
Fix default g:conflict_marker_common_ancestors
Frederick888 Feb 17, 2022
0c4377b
Match 7 or more pipes as common ancestors marker
Frederick888 Feb 17, 2022
4074004
Add full line common ancestors example
Frederick888 Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Conflict markers can be customized using the following options:
```vim
" Default values
let g:conflict_marker_begin = '^<<<<<<< \@='
let g:conflict_marker_common_ancestors = '^||||||| .*$'
let g:conflict_marker_common_ancestors = '^|||||||\+'
let g:conflict_marker_separator = '^=======$'
let g:conflict_marker_end = '^>>>>>>> \@='
```
Expand Down Expand Up @@ -94,8 +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 and end markers
" Include text after begin, common ancestors and end markers
let g:conflict_marker_begin = '^<<<<<<< .*$'
let g:conflict_marker_common_ancestors = '^|||||||\+ .*$'
let g:conflict_marker_end = '^>>>>>>> .*$'

highlight ConflictMarkerBegin guibg=#2f7366
Expand Down
2 changes: 1 addition & 1 deletion plugin/conflict_marker.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endfunction

call s:var('highlight_group', 'Error')
call s:var('begin', '^<<<<<<<')
call s:var('common_ancestors', '^|||||||')
call s:var('common_ancestors', '^|||||||\+')
call s:var('separator', '^=======$')
call s:var('end', '^>>>>>>>')
call s:var('enable_mappings', 1)
Expand Down
2 changes: 1 addition & 1 deletion test/test_default.vimspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Describe Default settings
Assert Exists('g:loaded_conflict_marker')
Assert Equals(g:conflict_marker_highlight_group, 'Error')
Assert Equals(g:conflict_marker_begin, '^<<<<<<<')
Assert Equals(g:conflict_marker_common_ancestors, '^|||||||')
Assert Equals(g:conflict_marker_common_ancestors, '^|||||||\+')
Assert Equals(g:conflict_marker_separator, '^=======$')
Assert Equals(g:conflict_marker_end, '^>>>>>>>')
Assert Equals(g:conflict_marker_enable_mappings, 1)
Expand Down
2 changes: 1 addition & 1 deletion test/test_matchit.vimspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Describe matchit

It defines b:match_words
Assert Exists('b:match_words')
Assert Match(b:match_words, ',^<<<<<<<:^|||||||:^=======$:^>>>>>>>')
Assert Match(b:match_words, ',^<<<<<<<:^|||||||\\+:^=======$:^>>>>>>>')
End

It can jump within a conflict marker
Expand Down