diff options
Diffstat (limited to 'src/test/ui/parser/diff-markers/enum-2.rs')
| -rw-r--r-- | src/test/ui/parser/diff-markers/enum-2.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/test/ui/parser/diff-markers/enum-2.rs b/src/test/ui/parser/diff-markers/enum-2.rs new file mode 100644 index 00000000000..76ea980fc62 --- /dev/null +++ b/src/test/ui/parser/diff-markers/enum-2.rs @@ -0,0 +1,11 @@ +enum E { + Foo { +<<<<<<< HEAD //~ ERROR encountered diff marker + x: u8, +||||||| + z: (), +======= + y: i8, +>>>>>>> branch + } +} |