diff options
Diffstat (limited to 'tests/ui/parser/diff-markers/enum.rs')
| -rw-r--r-- | tests/ui/parser/diff-markers/enum.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/ui/parser/diff-markers/enum.rs b/tests/ui/parser/diff-markers/enum.rs new file mode 100644 index 00000000000..45df6e3251d --- /dev/null +++ b/tests/ui/parser/diff-markers/enum.rs @@ -0,0 +1,7 @@ +enum E { +<<<<<<< HEAD //~ ERROR encountered diff marker + Foo(u8), +======= + Bar(i8), +>>>>>>> branch +} |