Revert "Fix #323: Always accept local changes to resolve merge conflicts" - #328

Revert "Fix #323: Always accept local changes to resolve merge conflicts"#328

mdboom merged 1 commit into

mainpython/bench_runner:mainfrom

revert-325-handle-merge-conflictspython/bench_runner:revert-325-handle-merge-conflictsCopy head branch name to clipboard