Skip to content

Commit 1625fed

Browse files
committed
make this comment correct
1 parent 0e3b5b1 commit 1625fed

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
@@ -2961,9 +2961,10 @@ impl<'a> Parser<'a> {
29612961

29622962
/// This checks if this is a conflict marker, depending of the parameter passed.
29632963
///
2964-
/// * `>>>>>`
2965-
/// * `=====`
2966-
/// * `<<<<<`
2964+
/// * `>>>>>>>`
2965+
/// * `|||||||`
2966+
/// * `=======`
2967+
/// * `<<<<<<<`
29672968
///
29682969
pub(super) fn is_vcs_conflict_marker(
29692970
&mut self,

0 commit comments

Comments
 (0)