summaryrefslogtreecommitdiffstats
path: root/tests/ui/parser/diff-markers/struct-expr.rs
blob: 99d2fd662c69ca70084ba1b6e1cf00adeec49f11 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
struct S {
    x: u8,
}
fn main() {
    let _ = S {
<<<<<<< HEAD //~ ERROR encountered diff marker
        x: 42,
=======
        x: 0,
>>>>>>> branch
    }
}