libgit2

merge

Version:
Custom merge drivers

Objects

A merge driver source represents the file to be merged

Structs

Merge driver structure used to register custom merge drivers

Macros

The "text" merge driver

The "binary" merge driver

The "union" merge driver

Callbacks

Initialize callback on merge driver

Shutdown callback on merge driver

Callback to perform the merge

Functions

Look up a merge driver by name

Get the repository that the source data is coming from

Gets the ancestor of the file to merge

Gets the ours side of the file to merge

Gets the theirs side of the file to merge

Gets the merge file options that the merge was invoked with

Register a merge driver under a given name

Remove the merge driver with the given name