Skip to content

Commit 9f63712

Browse files
committed
make this comment correct
1 parent d51b446 commit 9f63712

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

compiler/rustc_parse/src/parser/diagnostics.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -2958,9 +2958,10 @@ impl<'a> Parser<'a> {
29582958

29592959
/// This checks if this is a conflict marker, depending of the parameter passed.
29602960
///
2961-
/// * `>>>>>`
2962-
/// * `=====`
2963-
/// * `<<<<<`
2961+
/// * `<<<<<<<`
2962+
/// * `|||||||`
2963+
/// * `=======`
2964+
/// * `>>>>>>>`
29642965
///
29652966
pub(super) fn is_vcs_conflict_marker(
29662967
&mut self,

0 commit comments

Comments
 (0)