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