summaryrefslogtreecommitdiffstats
path: root/tests/ui/parser/diff-markers/enum-2.rs
blob: 76ea980fc628d562a351a626cf37a20686d2cdd0 (plain)
1
2
3
4
5
6
7
8
9
10
11
enum E {
    Foo {
<<<<<<< HEAD //~ ERROR encountered diff marker
        x: u8,
|||||||
        z: (),
=======
        y: i8,
>>>>>>> branch
    }
}