Struct ThreeWayMergeResult 

pub struct ThreeWayMergeResult {
    pub merged: String,
    pub has_conflicts: bool,
    pub conflicts: Vec<Conflict>,
    pub stats: MergeStats,
}

Result of a 3-way merge operation.

Fields

merged: String

The merged document content.

When has_conflicts is true, conflict regions are delimited with standard markers:

<<<<<<< ours
…our lines…
=======
…their lines…
>>>>>>> theirs

has_conflicts: bool

true when at least one conflict was detected and could not be auto-merged.

conflicts: Vec<Conflict>

Details of each conflict region.

stats: MergeStats

Summary statistics for the merge.

Trait Implementations

impl Clone for ThreeWayMergeResult

fn clone(&self) -> ThreeWayMergeResult

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ThreeWayMergeResult

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ThreeWayMergeResult

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Serialize for ThreeWayMergeResult

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.