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 d51b446 commit 9f63712Copy full SHA for 9f63712
compiler/rustc_parse/src/parser/diagnostics.rs
@@ -2958,9 +2958,10 @@ impl<'a> Parser<'a> {
2958
2959
/// This checks if this is a conflict marker, depending of the parameter passed.
2960
///
2961
- /// * `>>>>>`
2962
- /// * `=====`
2963
- /// * `<<<<<`
+ /// * `<<<<<<<`
+ /// * `|||||||`
+ /// * `=======`
2964
+ /// * `>>>>>>>`
2965
2966
pub(super) fn is_vcs_conflict_marker(
2967
&mut self,
0 commit comments