Improve error output when encountering git conflict markers#115413

atsuzaki wants to merge 2 commits intorust-lang:masterrust-lang/rust:masterfrom

atsuzaki:conflict-markeratsuzaki/rust:conflict-markerCopy head branch name to clipboard