Comment 5 for bug 1888659

I agree absolutely a change with merge conflicts needs fixing, apologies I didn't make that clear at all. What I am concerned about is that it's impossible to tell if the conflict markers are from the git diff process, or if the committer has manually fixed conflicts and missed some of the markers. If there could be some color or other marking for code that's in the actual change and code that is introduced by conflicts, that would be excellent, though I'm not sure how we'd approach doing that. Guessing this is a feature request?