Struct Sides 

pub struct Sides {
    pub ours: &'static str,
    pub theirs: &'static str,
    pub ours_mid: &'static str,
    pub theirs_mid: &'static str,
}

What a document calls the two sides of the comparison it describes.

This is the only thing that legitimately differs between the two producers of a class=CONFLICT finding: weave-mcp describes a merge, whose sides are ours and theirs; weave patch describes a patch landing on a target, whose sides are the target and the patch. Everything else — which kinds exist, what each one means, what to do about it — is one fact, and used to be written down twice in prose that had already drifted apart in wording.

Passing the vocabulary in is what lets there be one owner: the audience is a parameter, not a reason to fork the mapping.

Fields

ours: &'static str

Sentence-initial form — “Ours”, “The target”.

theirs: &'static str

ours_mid: &'static str

Mid-sentence form — “ours”, “the target”.

theirs_mid: &'static str

Implementations

impl Sides

pub const MERGE: Sides

A three-way merge of two branches.

Trait Implementations

impl Clone for Sides

fn clone(&self) -> Sides

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Copy for Sides

impl Debug for Sides

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Eq for Sides

impl PartialEq for Sides

fn eq(&self, other: &Sides) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl StructuralPartialEq for Sides