summaryrefslogtreecommitdiffstats
path: root/tests/ui/parser/diff-markers/trait-item.rs
blob: 3227c8212c96d39ede6d4da2e80a4fab93731d63 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
trait T {
<<<<<<< HEAD //~ ERROR encountered diff marker
    fn foo() {}
=======
    fn bar() {}
>>>>>>> branch
}

struct S;
impl T for S {}

fn main() {
    S::foo();
}