Comment 3 for bug 1888659

I have marked several changes as needs fixing because of seeing these markers in the diff for the change - it's really important that the diff shows the actual change, rather than adding extra markers which aren't in the commit, and if the change won't merge cleanly just show a message to indicate that, or better yet a click through thing to display the conflicts.