blob: 86c355628ab67fcff3aa90c2c61f1547bb7df162 [file] [log] [blame]
trait T {
fn foo(
<<<<<<< HEAD //~ ERROR encountered diff marker
x: u8,
=======
x: i8,
>>>>>>> branch
) {}
}
struct S;
impl T for S {}
fn main() {
S::foo(42);
}