rust/tests/ui/parser/diff-markers/unclosed-delims.rs

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

19 lines
425 B
Rust
Raw Normal View History

mod tests {
#[test]
<<<<<<< HEAD
//~^ ERROR encountered diff marker
2024-06-07 16:25:43 +02:00
//~| NOTE between this marker and `=======`
//~| NOTE conflict markers indicate that
//~| HELP if you're having merge conflicts
//~| NOTE for an explanation on these markers
2024-06-07 16:25:43 +02:00
fn test1() {
=======
2024-06-07 16:25:43 +02:00
//~^ NOTE between this marker and `>>>>>>>`
fn test2() {
>>>>>>> 7a4f13c blah blah blah
2024-06-07 16:25:43 +02:00
//~^ NOTE this marker concludes the conflict region
}
}