Enum ConflictStyle 

pub enum ConflictStyle {
    Merge,
    Diff3,
}

Which conflict-marker style merge_blobs emits.

Variants

Merge

Standard two-section markers (<<<<<<< / ======= / >>>>>>>).

Diff3

diff3 style: also include the common-ancestor section between ours and the ======= divider, delimited by |||||||.

Trait Implementations

impl Clone for ConflictStyle

fn clone(&self) -> ConflictStyle

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for ConflictStyle

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

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