Enum ResolutionSide 

pub enum ResolutionSide {
    Ours,
    Base,
    Theirs,
}

Which side of a conflict a resolution keeps.

Variants

Ours

The <<<<<<< side (typically HEAD).

Base

The ||||||| base (diff3/zdiff3 only).

Theirs

The >>>>>>> side (the merged-in branch).

Trait Implementations

impl Clone for ResolutionSide

fn clone(&self) -> ResolutionSide

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for ResolutionSide

impl Debug for ResolutionSide

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

Formats the value using the given formatter.

impl Eq for ResolutionSide

impl PartialEq for ResolutionSide

fn eq(&self, other: &ResolutionSide) -> 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 ResolutionSide