Module blob

Modules

builtin_driver

pipeline

platform

Structs

Driver

Define a driver program that performs a three-way merge.

Pipeline

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.

Platform

A utility for gathering and processing all state necessary to perform a three-way merge.

PlatformRef

The product of a prepare_merge() call to finally perform the merge and retrieve the merge results.

Enums

BuiltinDriver

Define a built-in way of performing a three-way merge, including auto-resolution support.

Resolution

Define if a merge is conflicted or not.

ResourceKind

A way to classify the side of a resource for merging.