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