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-expr.stderr | |
| 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-expr.stderr')
| -rw-r--r-- | src/test/ui/parser/diff-markers/struct-expr.stderr | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/test/ui/parser/diff-markers/struct-expr.stderr b/src/test/ui/parser/diff-markers/struct-expr.stderr new file mode 100644 index 00000000000..d70476a9833 --- /dev/null +++ b/src/test/ui/parser/diff-markers/struct-expr.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/struct-expr.rs:6:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | x: 42, +LL | ======= + | ------- +LL | x: 0, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts> + +error: aborting due to previous error + |