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