summaryrefslogtreecommitdiffstats
path: root/tests/ui/generic-associated-types/issue-91139.migrate.stderr
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ui/generic-associated-types/issue-91139.migrate.stderr')
-rw-r--r--tests/ui/generic-associated-types/issue-91139.migrate.stderr8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/ui/generic-associated-types/issue-91139.migrate.stderr b/tests/ui/generic-associated-types/issue-91139.migrate.stderr
new file mode 100644
index 000000000..690160577
--- /dev/null
+++ b/tests/ui/generic-associated-types/issue-91139.migrate.stderr
@@ -0,0 +1,8 @@
+error: expected identifier, found `<<`
+ --> $DIR/issue-91139.rs:1:1
+ |
+LL | <<<<<<< HEAD
+ | ^^ expected identifier
+
+error: aborting due to previous error
+