Enum ThreeWayStatus 

pub enum ThreeWayStatus {
    Unchanged,
    OursOnly,
    TheirsOnly,
    BothSame,
    Conflict,
    AddedBothSame,
    AddedBothDifferent,
    DeleteModify {
        deleted_by: Side,
    },
    BothDeleted,
}

Status of a file in a three-way diff.

Variants

Unchanged

File unchanged in all three versions.

OursOnly

Only our side modified the file (theirs unchanged from base).

TheirsOnly

Only their side modified the file (ours unchanged from base).

BothSame

Both sides made identical changes (auto-mergeable).

Conflict

Both sides modified differently (conflict).

AddedBothSame

Both sides added with same content (auto-mergeable).

AddedBothDifferent

Both sides added with different content (conflict).

DeleteModify

One side deleted, other side modified (conflict).

Fields

deleted_by: Side

Which side deleted the file.

BothDeleted

Both sides deleted the file.

Implementations

impl ThreeWayStatus

pub fn is_conflict(&self) -> bool

Returns true if this status represents a conflict.

pub fn is_auto_mergeable(&self) -> bool

Returns true if this status can be auto-merged.

Trait Implementations

impl Clone for ThreeWayStatus

fn clone(&self) -> ThreeWayStatus

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ThreeWayStatus

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ThreeWayStatus

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ThreeWayStatus

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

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl Eq for ThreeWayStatus

impl StructuralPartialEq for ThreeWayStatus