Sign in
rust
/
rust-lang
/
rust
/
refs/heads/try
/
.
/
tests
/
ui
/
parser
/
diff-markers
/
statement.rs
blob: e55d16d3bbb8eb112b7167aa0d4ce457ffd41264 [
file
] [
log
] [
blame
]
trait
T
{
fn
foo
()
{}
fn
bar
()
{}
}
struct
S
;
impl
T
for
S
{}
fn
main
()
{
<<<<<<<
HEAD
//~ ERROR encountered diff marker
S
::
foo
();
=======
S
::
bar
();
>>>>>>>
branch
}