Struct MergeScope 

pub struct MergeScope {
    pub base: Tree,
    pub ours: Tree,
    pub theirs: Tree,
    pub work: Tree,
    pub subjects: Vec<String>,
    pub unreadable: BTreeMap<String, String>,
    pub irregular: BTreeSet<String>,
    pub scope: String,
}

Everything the working-tree check needs: the three merge stages, the bytes on disk, the files the merge actually had to decide, and a sentence naming what was compared.

Fields

base: Tree

ours: Tree

theirs: Tree

work: Tree

The working tree, as it is right now.

subjects: Vec<String>

Files BOTH sides changed, plus anything git still has unmerged.

unreadable: BTreeMap<String, String>

Subjects a merge stage has but whose bytes could not be read, and why. They are not in subjects: a file checked against a stage it could not see would be checked against a guess. Each still gets a verdict.

irregular: BTreeSet<String>

Subjects a merge stage has as a symlink or a submodule: not source, and not in subjects.

scope: String