mirror of
https://github.com/rust-lang/rust.git
synced 2025-01-10 23:06:23 +00:00
10 lines
127 B
Rust
10 lines
127 B
Rust
|
enum E {
|
||
|
|
Foo {
|
||
|
|
<<<<<<< HEAD //~ ERROR encountered diff marker
|
||
|
|
x: u8,
|
||
|
|
=======
|
||
|
|
x: i8,
|
||
|
|
>>>>>>> branch
|
||
|
|
}
|
||
|
|
}
|