Git · merging: a shorter comment

This commit is contained in:
ZacharyZhang-NY committed 2026-10-07 03:06:11 -04:00
1 parent ef4ac5b1b8
commit e01b82bcbd
1 file changed
+1 -1
+1 -1
View File
@@ -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()