[Common] Add git conflict marker highlighting #3924
Annotations
1 error
Test on dev build
Process completed with exit code 1.
|