Struct TreeMergeConflictPresentation 

pub struct TreeMergeConflictPresentation<'a> {
    pub label_ours: &'a str,
    pub label_theirs: TheirsConflictLabel<'a>,
    pub label_base: &'a str,
    pub style: ConflictStyle,
    pub checkout_merge: bool,
}

Labels and marker style for conflict output during tree merges.

Fields

label_ours: &'a str

Label after <<<<<<< (Git: ours side name).

label_theirs: TheirsConflictLabel<'a>

Label after >>>>>>> (path-based or fixed).

label_base: &'a str

Label after ||||||| in diff3 output.

style: ConflictStyle

Two-way vs diff3 markers.

checkout_merge: bool

git checkout -m: always leave unmerged index entries when ours ≠ theirs.

Trait Implementations

impl<'a> Clone for TreeMergeConflictPresentation<'a>

fn clone(&self) -> TreeMergeConflictPresentation<'a>

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl<'a> Copy for TreeMergeConflictPresentation<'a>

impl<'a> Debug for TreeMergeConflictPresentation<'a>

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

Formats the value using the given formatter.

impl Default for TreeMergeConflictPresentation<'_>

fn default() -> Self

Returns the “default value” for a type.