git_merge_file_options

Options for merging a file

extern (C) nothrow @nogc

struct git_merge_file_options {

uint version_;

const(char)* ancestor_label;

const(char)* our_label;

const(char)* their_label;

.git_merge_file_favor_t favor;

ushort marker_size;

}

Members

Variables

ancestor_label const(char)* ancestor_label;: Label for the ancestor file side of the conflict which will be prepended to labels in diff3-format merge files.
favor .git_merge_file_favor_t favor;: The file to favor in region conflicts.
flags uint flags;: see git_merge_file_flag_t above
marker_size ushort marker_size;: The size of conflict markers (eg, "<<<<<<<"). Default is GIT_MERGE_CONFLICT_MARKER_SIZE.
our_label const(char)* our_label;: Label for our file side of the conflict which will be prepended to labels in merge files.
their_label const(char)* their_label;: Label for their file side of the conflict which will be prepended to labels in merge files.
version_ uint version_;: Undocumented in source.

Meta

Source

See Implementation