Enum MergeFavor 

pub enum MergeFavor {
    None,
    Ours,
    Theirs,
    Union,
}

Whether to favour one side wholesale for textual conflicts (-Xours / -Xtheirs), or to leave conflict markers in place.

Variants

None

Leave conflict markers in place (the default).

Ours

On a textual conflict, take ours’ content wholesale.

Theirs

On a textual conflict, take theirs’ content wholesale.

Union

On a textual conflict, keep BOTH sides’ lines (ours then theirs) with no markers — git’s merge=union attribute / --union (XDL_MERGE_FAVOR_UNION).

Trait Implementations

impl Clone for MergeFavor

fn clone(&self) -> MergeFavor

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for MergeFavor

impl Debug for MergeFavor

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

Formats the value using the given formatter.

impl Eq for MergeFavor

impl PartialEq for MergeFavor

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