mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-08 21:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

conflicts: delete unused conflict_to_materialized_value()

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-05-31 14:03:55 -07:00 committed by Martin von Zweigbergk
parent 35b19b1e28
commit 3a69fa48f6
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/conflicts.rs
View file

@ -257,20 +257,6 @@ fn diff_size(hunks: &[DiffHunk]) -> usize {
.sum() .sum()
} }
pub fn conflict_to_materialized_value(
store: &Store,
path: &RepoPath,
conflict: &Conflict,
) -> TreeValue {
let mut buf = vec![];
materialize_conflict(store, path, conflict, &mut buf).unwrap();
let file_id = store.write_file(path, &mut buf.as_slice()).unwrap();
TreeValue::File {
id: file_id,
executable: false,
}
}
/// Parses conflict markers from a slice. Returns None if there were no valid /// Parses conflict markers from a slice. Returns None if there were no valid
/// conflict markers. The caller has to provide the expected number of removed /// conflict markers. The caller has to provide the expected number of removed
/// and added inputs to the conflicts. Conflict markers that are otherwise valid /// and added inputs to the conflicts. Conflict markers that are otherwise valid