git_merge_options

Merging options

extern (C) nothrow @nogc

struct git_merge_options {

uint version_;

uint rename_threshold;

uint target_limit;

libgit2_d.diff.git_diff_similarity_metric* metric;

uint recursion_limit;

const(char)* default_driver;

.git_merge_file_favor_t file_favor;

uint file_flags;

}

Members

Variables

default_driver const(char)* default_driver;: Default merge driver to be used when both sides of a merge have changed. The default is the text driver.
file_favor .git_merge_file_favor_t file_favor;: Flags for handling conflicting content, to be used with the standard (text) merge driver.
file_flags uint file_flags;: see git_merge_file_flag_t above
flags uint flags;: See git_merge_flag_t above
metric libgit2_d.diff.git_diff_similarity_metric* metric;: Pluggable similarity metric; pass null to use internal metric
recursion_limit uint recursion_limit;: Maximum number of times to merge common ancestors to build a virtual merge base when faced with criss-cross merges. When this limit is reached, the next ancestor will simply be used instead of attempting to merge it. The default is unlimited.
rename_threshold uint rename_threshold;: Similarity to consider a file renamed (default 50). If git_merge_flag_t.GIT_MERGE_FIND_RENAMES is enabled, added files will be compared with deleted files to determine their similarity. Files that are more similar than the rename threshold (percentage-wise) will be treated as a rename.
target_limit uint target_limit;: Maximum similarity sources to examine for renames (default 200). If the number of rename candidates (add / delete pairs) is greater than this value, inexact rename detection is aborted.
version_ uint version_;: Undocumented in source.

Meta

Source

See Implementation

libgit2_d merge enums

functions

manifest constants

structs