Git · merging: a shorter comment

This commit is contained in:
ZacharyZhang-NY committed 2026-10-07 03:37:37 -04:00
1 parent af061f5737
commit 525085d6f3
1 file changed
+1 -1
+1 -1
View File
@@ -139,7 +139,7 @@ pub struct Conflict {
/// Git's conflict marker width, unless `conflict-marker-size` says otherwise.
pub const MARKER: usize = 7;
/// A marker line: `size` of `mark` exactly, then a label if `labelled`.
/// A marker line: exactly `size` of `mark`, maybe labelled.
fn marker(line: &str, mark: char, size: usize, labelled: bool) -> bool {
let line = line.trim_end_matches(['\n', '\r']);
let run = line.chars().take_while(|c| *c == mark).count();