Parse git diff markers

[WaffleLapkin]

When resolving git merge conflicts there is a lot of noise already and r-a's errors only add to it.

Ideally r-a should parse git diff markers, similarly to how rustc does that (see rust-lang/rust#106242).

[WaffleLapkin]

There is a feature request for this already. Ooops. #7127