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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/ui/parser/diff-markers/enum-2.rs b/src/test/ui/parser/diff-markers/enum-2.rs index d8c527281de..76ea980fc62 100644 --- a/src/test/ui/parser/diff-markers/enum-2.rs +++ b/src/test/ui/parser/diff-markers/enum-2.rs @@ -2,8 +2,10 @@ enum E { Foo { <<<<<<< HEAD //~ ERROR encountered diff marker x: u8, +||||||| + z: (), ======= - x: i8, + y: i8, >>>>>>> branch } } |