Doc updates and change default g:conflict_marker_common_ancestors #20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The default value was changed in [1]. [1] rhysd@0ada2b9
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
force-pushed
the
highlight-docs
branch
from
5df4d08
to
4074004
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix default g:conflict_marker_common_ancestors
Match 7 or more pipes as common ancestors marker
I'm not that sure about this commit. From [1]'s commit message, it
seems that there can be more than 7 pipes when conflict is 'nested'.
However I've never seen such a case and I wasn't able to find an
example online.
But if my assumption is correct, I guess it makes more sense to
match 7 or more pipes to avoid partial highlight?
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.
Before:
After:
[1] 0ada2b9