1 files changed, 7 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
index dd7341af4d5..7ab924bd39d 100644
--- a/compiler/rustc_parse/src/parser/diagnostics.rs
+++ b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -2579,12 +2579,16 @@ impl<'a> Parser<'a> {
         };
         let mut spans = Vec::with_capacity(3);
         spans.push(start);
+        let mut middlediff3 = None;
         let mut middle = None;
         let mut end = None;
         loop {
             if self.token.kind == TokenKind::Eof {
                 break;
             }
+            if let Some(span) = self.diff_marker(&TokenKind::OrOr, &TokenKind::BinOp(token::Or)) {
+                middlediff3 = Some(span);
+            }
             if let Some(span) = self.diff_marker(&TokenKind::EqEq, &TokenKind::Eq) {
                 middle = Some(span);
             }
@@ -2597,6 +2601,9 @@ impl<'a> Parser<'a> {
         }
         let mut err = self.struct_span_err(spans, "encountered diff marker");
         err.span_label(start, "after this is the code before the merge");
+        if let Some(middle) = middlediff3 {
+            err.span_label(middle, "");
+        }
         if let Some(middle) = middle {
             err.span_label(middle, "");
         }