We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 0e3b5b1 commit 1625fedCopy full SHA for 1625fed
compiler/rustc_parse/src/parser/diagnostics.rs
@@ -2961,9 +2961,10 @@ impl<'a> Parser<'a> {
2961
2962
/// This checks if this is a conflict marker, depending of the parameter passed.
2963
///
2964
- /// * `>>>>>`
2965
- /// * `=====`
2966
- /// * `<<<<<`
+ /// * `>>>>>>>`
+ /// * `|||||||`
+ /// * `=======`
2967
+ /// * `<<<<<<<`
2968
2969
pub(super) fn is_vcs_conflict_marker(
2970
&mut self,
0 commit comments