mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cleanup: fix formatting regression

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-11-14 12:46:31 -08:00
parent ae3ff4e1be
commit 30845c1f3b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/src/conflicts.rs
View file

@ -162,10 +162,7 @@ pub fn materialize_conflict(
.iter() .iter()
.map(|part| get_file_contents(store, path, part)) .map(|part| get_file_contents(store, path, part))
.collect_vec(); .collect_vec();
let removed_slices = removed_content let removed_slices = removed_content.iter().map(Vec::as_slice).collect_vec();
.iter()
.map(Vec::as_slice)
.collect_vec();
let added_slices = added_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); let merge_result = files::merge(&removed_slices, &added_slices);