I cannot understand this merge conflict without spending a lot of time comparing the sides:

• git co main
• git revert dffbdebac52a09539eb720d059d5a21f86fb7524

Observations:

• I can show a "base" editor but it does not reveal the area of the conflict when you make "base" visible
• I would have expected to see some red/green decorations for changes added or removed similar to diff, now I have to compare base with left and right side to find the changes, can we not visualise this better?

//cc @daviddossett