Enum DiffConflictResolution 

#[non_exhaustive]
pub enum DiffConflictResolution {
    Current,
    Incoming,
    Both,
}

How the user resolved a conflict.

Variants (Non-exhaustive)

Non-exhaustive enums could have additional variants added in future. Therefore, when matching against variants of non-exhaustive enums, an extra wildcard arm must be added to account for any future variants.

Current

Keep the current change, between <<<<<<< and =======.

Incoming

Keep the incoming change, between ======= and >>>>>>>.

Both

Keep the current change followed by the incoming one.

Trait Implementations

impl Clone for DiffConflictResolution

fn clone(&self) -> Self

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for DiffConflictResolution

impl Debug for DiffConflictResolution

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

Formats the value using the given formatter.

impl Eq for DiffConflictResolution

impl Hash for DiffConflictResolution

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl PartialEq for DiffConflictResolution

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for DiffConflictResolution