Enum git_workarea::MergeResult

pub enum MergeResult<'a> {
    Conflict(Vec<Conflict>),
    Ready(MergeCommand<'a>),
}

The result of an attempted merge.

Variants

Conflict(Vec<Conflict>)

A merge conflict occurred.

Ready(MergeCommand<'a>)

The merge is ready to be committed.

The command may be executed in order to create the commit from the merged tree.

Trait Implementations

impl<'a> Debug for MergeResult<'a>

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

Formats the value using the given formatter.