rust/tests/ui/parser/diff-markers/statement.rs

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

16 lines
184 B
Rust
Raw Normal View History

trait T {
fn foo() {}
fn bar() {}
}
struct S;
impl T for S {}
fn main() {
<<<<<<< HEAD //~ ERROR encountered diff marker
S::foo();
=======
S::bar();
>>>>>>> branch
}