Expand description
Generic algorithms for working with merged values, plus specializations for some common types of merged values.
Structs§
- Diff
- A generic diff/transition from one value to another.
- Merge
- A generic representation of merged values.
- Merge
Builder - Helper for consuming items from an iterator and then creating a
Merge.
Enums§
- Same
Change - Whether to resolve conflict that makes the same change at all sides.
Functions§
- trivial_
merge - Attempt to resolve trivial conflicts between the inputs. There must be an odd number of terms.
Type Aliases§
- Merged
Tree Val - Borrowed
MergedTreeValue. - Merged
Tree Value - The value at a given path in a commit.