mirror of
https://github.com/rust-lang/rust.git
synced 2024-12-18 03:25:55 +00:00
50ca5ef07f
Fix #116252.
10 lines
139 B
Rust
10 lines
139 B
Rust
macro_rules! foo {
|
|
<<<<<<< HEAD
|
|
//~^ ERROR encountered diff marker
|
|
() {
|
|
=======
|
|
() { //
|
|
>>>>>>> 7a4f13c blah blah blah
|
|
}
|
|
}
|