1 trait T { foo( <<<<<<< HEAD x: u8, ======= x: i8, >>>>>>> branch )2 fn foo( 3 <<<<<<< HEAD //~ ERROR encountered diff marker 4 x: u8, 5 ======= 6 x: i8, 7 >>>>>>> branch 8 ) {} 9 } 10 11 struct S; 12 impl T for S {} 13 main()14 fn main() { 15 S::foo(42); 16 } 17