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

wants to merge 3 commits into from

Commits on Feb 17, 2022

  1. Fix default g:conflict_marker_common_ancestors 

    The default value was changed in [1].

[1] rhysd@0ada2b9
    @Frederick888
    Frederick888 committed Feb 17, 2022
    Configuration menu
    Copy the full SHA
    562514d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. Match 7 or more pipes as common ancestors marker

    @Frederick888
    Frederick888 committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    0c4377b View commit details
    Browse the repository at this point in the history

  2. 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.
    @Frederick888
    Frederick888 committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    4074004 View commit details
    Browse the repository at this point in the history