[Suggestion] Change merge conflict colors

[chmartinez]

Hi! Thanks for the amazing theme. It looks great!
The only thing I noticed is that when you're trying to solve merge conflicts, both incoming and current changes are being highlighted with the same color:

My suggestion will be to use a different set of colors. In my case, I've used this:

"workbench.colorCustomizations": {
"merge.currentHeaderBackground": "#32766A",
"merge.currentContentBackground": "#2B4641",
"merge.incomingHeaderBackground": "#336493",
"merge.incomingContentBackground": "#2B3F51",
}

[pawelgrzybek]

Hi.

Fantastic suggestion! You can be assured that it will be added to a theme soon.

I am really glad that you like Gatito 🐱