From 525085d6f33bace54fa62a6c0bc71aaa6842f930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Wed, 7 Oct 2026 03:37:37 -0400 Subject: [PATCH] =?UTF-8?q?Git=20=C2=B7=20merging:=20a=20shorter=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/git/merging.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git/merging.rs b/src/git/merging.rs index a7dee3f..300faff 100644 --- a/src/git/merging.rs +++ b/src/git/merging.rs @@ -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();