Module merge 

Merge strategies keyed by MergeClass. Used by Sync (M2) and by callers resolving a PutResult::Conflict.

Enums

MergeOutcome

The result of attempting an automatic merge of two divergent bodies.

Functions

merge

Attempt to merge ours and theirs given their common base, according to class.