fork/rust

git clone https://git.julia.blue/fork/rust

borsAuto merge of #103046 - JanBeh:PR_clarify_cmp_terminology, r=workingjubilee3bcad65fbf6

master
859 B21 linesraw
1error: encountered diff marker
2  --> $DIR/enum-2.rs:3:1
3   |
4LL | <<<<<<< HEAD
5   | ^^^^^^^ after this is the code before the merge
6LL |         x: u8,
7LL | |||||||
8   | -------
9LL |         z: (),
10LL | =======
11   | -------
12LL |         y: i8,
13LL | >>>>>>> branch
14   | ^^^^^^^ above this are the incoming code changes
15   |
16   = 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
17   = 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
18   = 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>
19
20error: aborting due to previous error
21