mirror of https://github.com/rust-lang/rust.git
13 lines
312 B
Rust
13 lines
312 B
Rust
// The diff marker detection was removed for this example, because it relied on
|
|
// the lexer having a dependency on the parser, which was horrible.
|
|
|
|
mod tests {
|
|
#[test]
|
|
<<<<<<< HEAD
|
|
fn test1() {
|
|
=======
|
|
fn test2() {
|
|
>>>>>>> 7a4f13c blah blah blah
|
|
}
|
|
} //~ this file contains an unclosed delimiter
|