Handle merge conflicts when unrolling up PR#1426

rylev merged 2 commits intorust-lang:masterrust-lang/rustc-perf:masterfrom

rylev:handle-merge-conflictsrylev/rustc-perf:handle-merge-conflictsCopy head branch name to clipboard