Git · merging: a shorter comment
This commit is contained in:
1 file changed
+1
-1
+1
-1
@@ -161,7 +161,7 @@ pub fn conflicts(text: &str) -> Vec<Conflict> {
|
|||||||
found
|
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> {
|
pub fn marked(text: &str) -> Vec<Region> {
|
||||||
let lines: Vec<String> = text
|
let lines: Vec<String> = text
|
||||||
.tokenize_lines()
|
.tokenize_lines()
|
||||||
|
|||||||
Reference in new issue
Block a user