mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-30 12:07:40 +00:00
15 lines
252 B
Plaintext
15 lines
252 B
Plaintext
|
error: encountered diff marker
|
||
|
|
--> $DIR/struct-expr.rs:6:1
|
||
|
|
|
|
||
|
|
LL | <<<<<<< HEAD
|
||
|
|
| ^^^^^^^ start
|
||
|
|
LL | x: 42,
|
||
|
|
LL | =======
|
||
|
|
| ^^^^^^^ middle
|
||
|
|
LL | x: 0,
|
||
|
|
LL | >>>>>>> branch
|
||
|
|
| ^^^^^^^ end
|
||
|
|
|
||
|
|
error: aborting due to previous error
|
||
|
|
|