diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs index c97c30303..6b0c33224 100644 --- a/lib/src/conflicts.rs +++ b/lib/src/conflicts.rs @@ -162,10 +162,7 @@ pub fn materialize_conflict( .iter() .map(|part| get_file_contents(store, path, part)) .collect_vec(); - let removed_slices = removed_content - .iter() - .map(Vec::as_slice) - .collect_vec(); + let removed_slices = removed_content.iter().map(Vec::as_slice).collect_vec(); let added_slices = added_content.iter().map(Vec::as_slice).collect_vec(); let merge_result = files::merge(&removed_slices, &added_slices);