This is an automated email from the git hooks/post-receive script.

unknown user pushed a change to branch master in repository clang.

from 9fecde6 ASTMerge: specify arch for GCCAsmStmt test explicitly to calm [...] new 7fc60d9 Merge conflicting replacements when they are order-independent. new e716c9e ASTMerge: explicitly specify arch for GCCAsmStmt test to calm [...]

The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.

Summary of changes: include/clang/Tooling/Core/Replacement.h | 37 +++++- lib/Tooling/Core/Replacement.cpp | 107 +++++++++++++++-- test/ASTMerge/Inputs/asm-function.cpp | 11 ++ test/ASTMerge/asm.cpp | 7 ++ unittests/Tooling/RefactoringTest.cpp | 192 +++++++++++++++++++++++++++++-- 5 files changed, 331 insertions(+), 23 deletions(-) create mode 100644 test/ASTMerge/Inputs/asm-function.cpp create mode 100644 test/ASTMerge/asm.cpp