Add support for diff3 format

2022-12-28 20:55:46 -08:00 · 2022-12-28 20:55:46 -08:00 · 62c8e3144a
commit 62c8e3144a
parent 698ebe357f
3 changed files with 14 additions and 2 deletions
--- 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
    }
 }
--- a/src/test/ui/parser/diff-markers/enum-2.stderr
+++ b/src/test/ui/parser/diff-markers/enum-2.stderr
@ -4,9 +4,12 @@ error: encountered diff marker
 LL | <<<<<<< HEAD
   | ^^^^^^^ after this is the code before the merge
 LL |         x: u8,
+LL | |||||||
+   | -------
+LL |         z: (),
 LL | =======
   | -------
-LL |         x: i8,
+LL |         y: i8,
 LL | >>>>>>> branch
   | ^^^^^^^ above this are the incoming code changes
   |