Support long diff conflict markers#150443

rust-bors[bot] merged 1 commit intorust-lang:mainrust-lang/rust:mainfrom

estebank:long-diff-markersestebank/rust:long-diff-markersCopy head branch name to clipboard