blob: 653a605c28c608798d1f1cd89555c8b45329bb22 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
|
mod tests {
#[test]
<<<<<<< HEAD
//~^ ERROR encountered diff marker
//~| NOTE after this is the code before the merge
//~| NOTE for an explanation on these markers
fn test1() {
=======
//~^ NOTE
fn test2() {
>>>>>>> 7a4f13c blah blah blah
//~^ NOTE above this are the incoming code changes
}
}
|
