| 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 | |
| } | |
| } |