diff options
| author | Jordan Rupprecht <rupprecht@google.com> | 2019-05-14 21:58:59 +0000 |
|---|---|---|
| committer | Jordan Rupprecht <rupprecht@google.com> | 2019-05-14 21:58:59 +0000 |
| commit | 46054fed6aeeabea27b9ba4a3ef81ab5ff9b9645 (patch) | |
| tree | d12279f80b5729d0324f066002c838baa736fbd2 /test/clang-apply-replacements/Inputs/conflict/file3.yaml | |
| parent | 5026a9a16d10a2edf09be54c7225f49b5789c69e (diff) | |
| parent | 0eb1ac6d1df856f065717226ef34d00679a211fe (diff) | |
Creating branches/google/stable and tags/google/stable/2019-05-14 from r360103upstream/stable
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/branches/google/stable@360714 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/clang-apply-replacements/Inputs/conflict/file3.yaml')
| -rw-r--r-- | test/clang-apply-replacements/Inputs/conflict/file3.yaml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/test/clang-apply-replacements/Inputs/conflict/file3.yaml b/test/clang-apply-replacements/Inputs/conflict/file3.yaml index 88543e0a..fee1108c 100644 --- a/test/clang-apply-replacements/Inputs/conflict/file3.yaml +++ b/test/clang-apply-replacements/Inputs/conflict/file3.yaml @@ -2,12 +2,13 @@ MainSourceFile: source1.cpp Diagnostics: - DiagnosticName: test-conflict - Message: Fix - FilePath: $(path)/common.h - FileOffset: 169 - Replacements: - - FilePath: $(path)/common.h - Offset: 169 - Length: 0 - ReplacementText: "(int*)" + DiagnosticMessage: + Message: Fix + FilePath: $(path)/common.h + FileOffset: 169 + Replacements: + - FilePath: $(path)/common.h + Offset: 169 + Length: 0 + ReplacementText: "(int*)" ... |