Fix syntax highlighting in merge conflict UI

Annabel Dunstone Grayrequested to merge
merge-conflicts-syntax-highlight into master

What does this MR do and why?

Fixes ours/theirs highlighting in merge conflict UI reported in Slack

Screenshots or screen recordings

Before After
Screenshot_2025-07-24_at_2.00.08_PM Screenshot_2025-07-24_at_1.59.34_PM

Different highlighting themes (works the same in light and dark modes)
Screenshot_2025-07-24_at_1.52.23_PM Screenshot_2025-07-24_at_1.52.37_PM Screenshot_2025-07-24_at_1.52.57_PM Screenshot_2025-07-24_at_1.53.09_PM Screenshot_2025-07-24_at_1.53.25_PM

How to set up and validate locally

  • Go to MR with merge conflicts
  • Click "Resolve conflicts` in merge widget

Links

Edited by Annabel Dunstone Gray

Merge request reports