Struct ConflictRegion 

#[non_exhaustive]
pub struct ConflictRegion {
    pub ours_label: String,
    pub base_label: Option<String>,
    pub theirs_label: String,
    pub ours: Vec<String>,
    pub base: Option<Vec<String>>,
    pub theirs: Vec<String>,
    pub marker_len: usize,
    /* private fields */
}

One conflicted region: the lines of each side plus the verbatim marker lines (kept so rendering is byte-exact).

All line vectors store lines with their original endings; the last line of a file may have none.

serde wire shape. Under the optional serde feature this serializes to exactly its public fields — the labels, the three sides, and marker_len. The private verbatim marker lines are skipped: they exist only so render can reproduce the file byte-for-byte, they are not part of the modelled conflict, and emitting them would publish an implementation detail on the wire. Nothing the public model carries is lost.

Fields (Non-exhaustive)

Non-exhaustive structs could have additional fields added in future. Therefore, non-exhaustive structs cannot be constructed in external crates using the traditional Struct { .. } syntax; cannot be matched against without a wildcard ..; and struct update syntax will not work.

ours_label: String

Label after the <<<<<<< marker (e.g. HEAD); empty when absent.

base_label: Option<String>

Label after the ||||||| marker; None for 2-way conflicts.

theirs_label: String

Label after the >>>>>>> marker (e.g. the branch name).

ours: Vec<String>

The <<<<<<<-side lines.

base: Option<Vec<String>>

The base lines (diff3/zdiff3); None for 2-way conflicts.

theirs: Vec<String>

The >>>>>>>-side lines.

marker_len: usize

The marker run length (7 unless merge.conflictMarkerSize raised it).

Trait Implementations

impl Clone for ConflictRegion

fn clone(&self) -> ConflictRegion

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictRegion

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

Formats the value using the given formatter.

impl Eq for ConflictRegion

impl PartialEq for ConflictRegion

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

Equality operator ==.

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

Inequality operator !=.

impl Serialize for ConflictRegion

Available on crate feature serde only.

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

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl StructuralPartialEq for ConflictRegion