diff options
Diffstat (limited to 'tests/ui/parser/diff-markers/use-statement.rs')
-rw-r--r-- | tests/ui/parser/diff-markers/use-statement.rs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/ui/parser/diff-markers/use-statement.rs b/tests/ui/parser/diff-markers/use-statement.rs new file mode 100644 index 000000000..6306243a5 --- /dev/null +++ b/tests/ui/parser/diff-markers/use-statement.rs @@ -0,0 +1,9 @@ +use foo::{ +<<<<<<< HEAD //~ ERROR encountered diff marker + bar, +======= + baz, +>>>>>>> branch +}; + +fn main() {} |