Enum git_workarea::MergeResult
[−]
[src]
pub enum MergeResult<'a> { Conflict(Vec<Conflict>), Ready(MergeCommand), // some variants omitted }
The result of an attempted merge.
Variants
Conflict(Vec<Conflict>)
A merge conflict occurred.
Ready(MergeCommand)
The merge is ready to be committed.
The command may be executed in order to create the commit from the merged tree.