Expand description
Modules§
Structs§
- Define a driver program that performs a three-way merge.
- A conversion pipeline to take an object or path from what’s stored in Git to what can be merged, while following the guidance of git-attributes at the respective path to learn how the merge should be performed.
- A utility for gathering and processing all state necessary to perform a three-way merge.
- The product of a
prepare_merge()call to finally perform the merge and retrieve the merge results.
Enums§
- Define a built-in way of performing a three-way merge, including auto-resolution support.
- Define if a merge is conflicted or not.
- A way to classify the side of a resource for merging.