Expand description
Generic algorithms for working with merged values, plus specializations for some common types of merged values.
Structs§
- A generic representation of merged values.
- Helper for consuming items from an iterator and then creating a
Merge
.
Functions§
- Attempt to resolve trivial conflicts between the inputs. There must be exactly one more adds than removes.
Type Aliases§
- Borrowed
MergedTreeValue
. - The value at a given path in a commit.