make this comment correct

2024-06-10 10:16:51 +02:00
parent d51b4462ec
commit 9f6371236f
1 changed files with 4 additions and 3 deletions
--- a/compiler/rustc_parse/src/parser/diagnostics.rs
+++ b/compiler/rustc_parse/src/parser/diagnostics.rs
@@ -2958,9 +2958,10 @@ impl<'a> Parser<'a> {

    /// This checks if this is a conflict marker, depending of the parameter passed.
    ///
-    /// * `>>>>>`
-    /// * `=====`
-    /// * `<<<<<`
+    /// * `<<<<<<<`
+    /// * `|||||||`
+    /// * `=======`
+    /// * `>>>>>>>`
    ///
    pub(super) fn is_vcs_conflict_marker(
        &mut self,