Enum ConflictStyle

pub enum ConflictStyle {
    Merge,
    Diff3,
    ZealousDiff3,
}

The way the built-in text driver will express merge conflicts in the resulting file.

Variants

Merge

Only show the zealously minified conflicting lines of the local changes and the incoming (other) changes, hiding the base version entirely.

line1-changed-by-both
<<<<<<< local
line2-to-be-changed-in-incoming
=======
line2-changed
>>>>>>> incoming

Diff3

Show non-minimized hunks of local changes, the base, and the incoming (other) changes.

This mode does not hide any information.

<<<<<<< local
line1-changed-by-both
line2-to-be-changed-in-incoming
||||||| 9a8d80c
line1-to-be-changed-by-both
line2-to-be-changed-in-incoming
=======
line1-changed-by-both
line2-changed
>>>>>>> incoming

ZealousDiff3

Like `Diff3, but will show minimized hunks of local change and the incoming (other) changes, as well as non-minimized hunks of the base.

line1-changed-by-both
<<<<<<< local
line2-to-be-changed-in-incoming
||||||| 9a8d80c
line1-to-be-changed-by-both
line2-to-be-changed-in-incoming
=======
line2-changed
>>>>>>> incoming

Trait Implementations

impl Clone for ConflictStyle

fn clone(&self) -> ConflictStyle

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictStyle

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

Formats the value using the given formatter.

impl Default for ConflictStyle

fn default() -> ConflictStyle

Returns the “default value” for a type.

impl Hash for ConflictStyle

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 Ord for ConflictStyle

fn cmp(&self, other: &ConflictStyle) -> Ordering

This method returns an Ordering between self and other.

fn max(self, other: Self) -> Self

where Self: Sized,

Compares and returns the maximum of two values.

fn min(self, other: Self) -> Self

where Self: Sized,

Compares and returns the minimum of two values.

fn clamp(self, min: Self, max: Self) -> Self

where Self: Sized,

Restrict a value to a certain interval.

impl PartialEq for ConflictStyle

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

fn partial_cmp(&self, other: &ConflictStyle) -> Option<Ordering>

This method returns an ordering between self and other values if one exists.

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

Tests less than (for self and other) and is used by the < operator.

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

Tests less than or equal to (for self and other) and is used by the <= operator.

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

Tests greater than (for self and other) and is used by the > operator.

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

Tests greater than or equal to (for self and other) and is used by the >= operator.

impl Copy for ConflictStyle

impl Eq for ConflictStyle

impl StructuralPartialEq for ConflictStyle