From 5df4d082acb59b207853e076e57fba83e3943f1c Mon Sep 17 00:00:00 2001 From: Frederick Zhang Date: Fri, 18 Feb 2022 00:24:49 +1100 Subject: [PATCH] Add full line common ancestors example 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. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 012f517..b691562 100644 --- a/README.md +++ b/README.md @@ -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