HomePhabricator

Fix a bad merge conflict resolution
f7f52122da3cUnpublished

Authored by bob.wilson on Jul 7 2018, 2:08 PM.

Unpublished Commit ยท Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Fix a bad merge conflict resolution

The upstream-with-swift branch has refactored some code into a separate
function where the "method" parameter is named "M", but the conflict was
resolved without adjusting the name.

apple-llvm-split-commit: f7d5f3be14fa3cb4bf92992573e56cd177324585
apple-llvm-split-dir: clang/

Details

Committed
bob.wilsonJul 7 2018, 2:08 PM
Parents
rG24f0eb28cc65: Propagating prior merge from 'llvm.org/master'.
Branches
Unknown
Tags
Unknown