mirror of
https://github.com/rust-lang/rust.git
synced 2025-05-01 12:37:37 +00:00
15 lines
243 B
Plaintext
15 lines
243 B
Plaintext
|
error: encountered diff marker
|
||
|
|
--> $DIR/use-statement.rs:2:1
|
||
|
|
|
|
||
|
|
LL | <<<<<<< HEAD
|
||
|
|
| ^^^^^^^ start
|
||
|
|
LL | bar,
|
||
|
|
LL | =======
|
||
|
|
| ^^^^^^^ middle
|
||
|
|
LL | baz,
|
||
|
|
LL | >>>>>>> branch
|
||
|
|
| ^^^^^^^ end
|
||
|
|
|
||
|
|
error: aborting due to previous error
|
||
|
|
|