diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-29 13:16:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-29 13:16:06 +0100 |
| commit | 031a2143f0ef78e9b080b20481507ec0268e7bab (patch) | |
| tree | 3f09df0b5e60fd60fadea3fd1a8cd8abee15bbb1 /src/test/ui/parser/diff-markers/struct.rs | |
| parent | 98f2409c82a9527428abd6514aba36444f8428dc (diff) | |
| parent | 62c8e3144a8bc7d07d66bc14c8a7cce94a3dbce5 (diff) | |
| download | rust-031a2143f0ef78e9b080b20481507ec0268e7bab.tar.gz rust-031a2143f0ef78e9b080b20481507ec0268e7bab.zip | |
Rollup merge of #106242 - estebank:diff-markers, r=jyn514
Detect diff markers in the parser Partly address #32059.
Diffstat (limited to 'src/test/ui/parser/diff-markers/struct.rs')
| -rw-r--r-- | src/test/ui/parser/diff-markers/struct.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/ui/parser/diff-markers/struct.rs b/src/test/ui/parser/diff-markers/struct.rs new file mode 100644 index 00000000000..d26464d47bc --- /dev/null +++ b/src/test/ui/parser/diff-markers/struct.rs @@ -0,0 +1,7 @@ +struct S { +<<<<<<< HEAD //~ ERROR encountered diff marker + x: u8, +======= + x: i8, +>>>>>>> branch +} |