pub fn diff_three_way<S: ObjectStoreExt>(
store: &S,
vault: &KeyVault,
base: Option<&VoidCid>,
ours: &VoidCid,
theirs: &VoidCid,
) -> Result<ThreeWayDiff>Expand description
Computes a three-way diff between a base commit and two branch commits.