Skip to content

Commit

Permalink
Add full line common ancestors example
Browse files Browse the repository at this point in the history
Since the goal of the example configuration here seems to be making
highlight of each whole marker line consistent, it'd be nice to
configure g:conflict_marker_common_ancestors as well to prevent ancestor
commit hashes from being highlighted differently.
  • Loading branch information
Frederick888 committed Feb 17, 2022
1 parent af50203 commit 5df4d08
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
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

0 comments on commit 5df4d08

Please sign in to comment.