Struct ConflictResult 

pub struct ConflictResult {
    pub choice: ConflictChoice,
    pub merged_file: Option<String>,
    pub save_merged: bool,
}

Result of conflict resolution.

Fields

choice: ConflictChoice

The choice made to resolve the conflict.

merged_file: Option<String>

Path to merged file (if choice is Merged).

save_merged: bool

Whether to save the resolution to the working copy.

Trait Implementations

impl Clone for ConflictResult

fn clone(&self) -> ConflictResult

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictResult

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

Formats the value using the given formatter.

impl Default for ConflictResult

fn default() -> Self

Returns the “default value” for a type.