diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs index 542278645..c64980cb4 100644 --- a/lib/src/conflicts.rs +++ b/lib/src/conflicts.rs @@ -247,11 +247,11 @@ impl Conflict> { } } MergeHunk::Conflict(ConflictHunk { removes, adds }) => { - for (i, buf) in removes.iter().enumerate() { - removed_content[i].extend_from_slice(buf); + for (i, buf) in removes.into_iter().enumerate() { + removed_content[i].extend(buf); } - for (i, buf) in adds.iter().enumerate() { - added_content[i].extend_from_slice(buf); + for (i, buf) in adds.into_iter().enumerate() { + added_content[i].extend(buf); } } }