Enum SameChange 

pub enum SameChange {
    Keep,
    Accept,
}

Whether to resolve conflict that makes the same change at all sides.

Variants

Keep

Leaves same-change conflict unresolved.

Accept

Resolves same-change conflict as if one side were unchanged. (i.e. A+(A-B)=A)

This matches what Git and Mercurial do (in the 3-way case at least), but not what Darcs does. It means that repeated 3-way merging of multiple trees may give different results depending on the order of merging.

Trait Implementations

impl Clone for SameChange

fn clone(&self) -> SameChange

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for SameChange

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for SameChange

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for SameChange

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

impl Eq for SameChange

impl StructuralPartialEq for SameChange