diff options
| author | ardi <ardis@ardi.dev> | 2024-06-10 10:16:51 +0200 |
|---|---|---|
| committer | ardi <ardis@ardi.dev> | 2024-06-19 00:27:41 +0200 |
| commit | 9f6371236f516ac2a883eb8707839ab80fc7f9f7 (patch) | |
| tree | 7e70dacf4f1381fa3c5e7e118774972d1f124b11 /compiler/rustc_parse/src/parser | |
| parent | d51b4462ec2d4a7d8d647afcf86353ca4e971b70 (diff) | |
| download | rust-9f6371236f516ac2a883eb8707839ab80fc7f9f7.tar.gz rust-9f6371236f516ac2a883eb8707839ab80fc7f9f7.zip | |
make this comment correct
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index e4630bbceb9..db23ce6fb7b 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -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, |