mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-22 20:03:37 +00:00
15 lines
170 B
Rust
15 lines
170 B
Rust
|
trait T {
|
||
|
|
<<<<<<< HEAD //~ ERROR encountered diff marker
|
||
|
|
fn foo() {}
|
||
|
|
=======
|
||
|
|
fn bar() {}
|
||
|
|
>>>>>>> branch
|
||
|
|
}
|
||
|
|
|
||
|
|
struct S;
|
||
|
|
impl T for S {}
|
||
|
|
|
||
|
|
fn main() {
|
||
|
|
S::foo();
|
||
|
|
}
|