diff options
Diffstat (limited to 'src/test/ui/parser/diff-markers/tuple-struct.stderr')
| -rw-r--r-- | src/test/ui/parser/diff-markers/tuple-struct.stderr | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/test/ui/parser/diff-markers/tuple-struct.stderr b/src/test/ui/parser/diff-markers/tuple-struct.stderr deleted file mode 100644 index d673db89837..00000000000 --- a/src/test/ui/parser/diff-markers/tuple-struct.stderr +++ /dev/null @@ -1,18 +0,0 @@ -error: encountered diff marker - --> $DIR/tuple-struct.rs:2:1 - | -LL | <<<<<<< HEAD - | ^^^^^^^ after this is the code before the merge -LL | u8, -LL | ======= - | ------- -LL | i8, -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 - |