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 { 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 { let lines: Vec = text .tokenize_lines()