diff options
Diffstat (limited to 'tests/ui/parser/diff-markers/item.rs')
| -rw-r--r-- | tests/ui/parser/diff-markers/item.rs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/ui/parser/diff-markers/item.rs b/tests/ui/parser/diff-markers/item.rs new file mode 100644 index 000000000..4ed36b7b4 --- /dev/null +++ b/tests/ui/parser/diff-markers/item.rs @@ -0,0 +1,9 @@ +<<<<<<< HEAD //~ ERROR encountered diff marker +fn foo() {} +======= +fn bar() {} +>>>>>>> branch + +fn main() { + foo(); +} |