git is performing a 3-way merge and has a conflict it can't resolve, it marks up that area of the file like this:
No unresolvable conflicts here <<<<<<< HEAD xyz ||||||| parent of ... abc ======= 123 >>>>>>> ...
Is there a way (and, if so, how) to change the background color of these 3 "sections":
<<<<<<< HEADthrough the line before
||||||| parent of ...
||||||| parent of ...through the line before
- The line after
=======through the line
(EDIT: The question revolves around if there's a way to highlight certain lines depending on other lines.
xyz would ordinarily not be highlighted, but since it's between
||||||| it would be highlighted.)
With also being able to handle other sets of conflict markers?
Using the most recent version of vim available at the time of a comment. So, as of now, 8.1.1183.
I use a black background and 256 colors in my terminal. I was thinking it would be nice to give these sections using the darkest R/G/B/C/M/Y colors, so they didn't cause much of a problem with syntax highlighting. (Talking about ANSI colors 52, 22, 17, 23, 53, and 58 - not the 1-6 colors.)