Function jj_lib::tree::try_resolve_file_conflict

pub fn try_resolve_file_conflict(
    store: &Store,
    filename: &RepoPath,
    conflict: &MergedTreeValue
) -> Result<Option<TreeValue>, TreeMergeError>

Resolves file-level conflict by merging content hunks.

The input conflict is supposed to be simplified. It shouldn’t contain non-file values that cancel each other.