Rollup merge of #106175 - compiler-errors:bad-import-sugg, r=oli-obk

[rust.git] / src / test / ui / parser / diff-markers / struct.rs

struct S {
<<<<<<< HEAD //~ ERROR encountered diff marker
    x: u8,
=======
    x: i8,
>>>>>>> branch
}