bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

make this comment correct

Browse source
This commit is contained in:
ardi 2024-06-10 10:16:51 +02:00
parent d51b4462ec
commit 9f6371236f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -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,