Struct Conflict 

pub struct Conflict {
    pub number: usize,
    pub ours: ConflictSide,
    pub base: Option<ConflictSide>,
    pub theirs: ConflictSide,
    pub end_line: usize,
}

One conflict block.

Fields

number: usize

1-based, in file order.

ours: ConflictSide

Ours: between <<<<<<< and ||||||| or =======.

base: Option<ConflictSide>

The common ancestor, in diff3 style: between ||||||| and =======.

theirs: ConflictSide

Theirs: between ======= and >>>>>>>. Its label is the one on the closing >>>>>>> marker.

end_line: usize

The 1-based line of the closing >>>>>>> marker.

Implementations

impl Conflict

pub fn start_line(&self) -> usize

The 1-based line of the opening <<<<<<< marker.

pub fn span(&self) -> Range<usize>

The block’s lines, markers included, as 0-based indices.

pub fn sides(&self) -> Vec<(Pick, &ConflictSide)>

The sides in display order: ours, base (when present), theirs.

Trait Implementations

impl Clone for Conflict

fn clone(&self) -> Self

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Conflict

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

Formats the value using the given formatter.

impl Eq for Conflict

impl PartialEq for Conflict

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

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl StructuralPartialEq for Conflict