Function jj_lib::tree::try_resolve_file_conflict

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