Struct Merge 

pub struct Merge {
    pub conflict_log: ConflictLog,
    pub edit_log: EditLog,
    /* private fields */
}

The main merge struct that orchestrates the 3-way merge.

Fields

conflict_log: ConflictLog

Log of conflicts encountered during merge.

edit_log: EditLog

Log of edit operations performed.

Implementations

impl Merge

pub fn new(matching: TriMatching) -> Self

Creates a new Merge from a TriMatching.

pub fn matching(&self) -> &TriMatching

Returns a reference to the tri-matching.

pub fn merge<W: Write>(&mut self, writer: &mut W) -> Result<()>

Runs the 3-way merge and writes the result.

The output is written as XML to the provided writer.

pub fn merge_to_tree(&mut self) -> NodeRef

Runs the 3-way merge and returns the merged tree.

This is useful when you need to programmatically inspect or further modify the merge result before output.