- VSCode Version: Code 1.19.1 (0759f77, 2017-12-19T09:46:23.884Z)
- OS Version: Windows_NT x64 10.0.16299
Highlighting of current line works fine inside inline merge conflict blocks, but if the color theme changes the background color of these areas, the line highlighting disappears.
Steps to Reproduce:
- Choose a theme with line highlighting, I used Solarized Dark
- Add a 'merge conflict' to the editor, for instance
<<<<<<<
check if
line highlighting
works here
=======
>>>>>>>
- Check that line highlighting works inside the merge conflict area
- Set the background color for merge conflicts, for instance add to settings:
"workbench.colorCustomizations": {
"merge.currentHeaderBackground": "#207972",
"merge.currentContentBackground": "#0D4A4E"
},
- Now current line is no longer highlighted inside the merge conflict area
Highlighting of current line works fine inside inline merge conflict blocks, but if the color theme changes the background color of these areas, the line highlighting disappears.
Steps to Reproduce: