From e01b82bcbdd2eeea8ff2331db7976a76cf3d49be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?=
 <zhangyanghaha0407@outlook.com>
Date: Wed, 7 Oct 2026 03:06:11 -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 9ff61cd..88f457d 100644
--- a/src/git/merging.rs
+++ b/src/git/merging.rs
@@ -161,7 +161,7 @@ pub fn conflicts(text: &str) -> Vec<Conflict> {
     found
 }
 
-/// Regions as Git grouped them in marked `text`; base from diff3 sections.
+/// Regions as Git grouped marked `text`; base from diff3.
 pub fn marked(text: &str) -> Vec<Region> {
     let lines: Vec<String> = text
         .tokenize_lines()