about summary refs log tree commit diff
path: root/tests/ui/parser/diff-markers/unclosed-delims.rs
blob: daf2a9bac98abcc54b11c3795193e5b6edb6a666 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
// 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
    }
} //~ ERROR this file contains an unclosed delimiter