Enum ConflictMarkerStyle

pub enum ConflictMarkerStyle {
    Diff,
    Snapshot,
    Git,
}

Describes what style should be used when materializing conflicts.

Variants

Diff

Style which shows a snapshot and a series of diffs to apply.

Snapshot

Style which shows a snapshot for each base and side.

Git

Style which replicates Git’s “diff3” style to support external tools.

Trait Implementations

impl Clone for ConflictMarkerStyle

fn clone(&self) -> ConflictMarkerStyle

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictMarkerStyle

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

Formats the value using the given formatter.

impl Default for ConflictMarkerStyle

fn default() -> ConflictMarkerStyle

Returns the “default value” for a type.

impl<'de> Deserialize<'de> for ConflictMarkerStyle

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ConflictMarkerStyle

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

Tests for self and other values to be equal, and is used by ==.

const 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 ConflictMarkerStyle

impl Eq for ConflictMarkerStyle

impl StructuralPartialEq for ConflictMarkerStyle