Enum MergeRegion 

pub enum MergeRegion {
    Common(Vec<String>),
    Ours(Vec<String>),
    Theirs(Vec<String>),
    Conflict {
        ours: Vec<String>,
        theirs: Vec<String>,
    },
}

Outcome of merging a single region.

Variants

Common(Vec<String>)

Both sides agree — use the common text.

Ours(Vec<String>)

Only one side changed.

Theirs(Vec<String>)

Only the other side changed.

Conflict

Both sides changed differently — a conflict.

Fields

ours: Vec<String>

theirs: Vec<String>

Trait Implementations

impl Clone for MergeRegion

fn clone(&self) -> MergeRegion

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeRegion

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

Formats the value using the given formatter.

impl PartialEq for MergeRegion

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

Tests for self and other values to be equal, and is used by ==.

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

Tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl StructuralPartialEq for MergeRegion