libgit2

git_merge_file_options

Version:

Options for merging a file

Signature

GitHub
typedef struct git_merge_file_options { unsigned int version const char *ancestor_label const char *our_label const char *their_label git_merge_file_favor_t favor git_merge_file_flag_t flags unsigned short marker_size };

Members

unsigned int
version
const char *
ancestor_label

Label for the ancestor file side of the conflict which will be prepended to labels in diff3-format merge files.

const char *
our_label

Label for our file side of the conflict which will be prepended to labels in merge files.

const char *
their_label

Label for their file side of the conflict which will be prepended to labels in merge files.

git_merge_file_favor_t
favor

The file to favor in region conflicts.

git_merge_file_flag_t
flags

see git_merge_file_flag_t above

unsigned short
marker_size

The size of conflict markers (eg, "<<<<<<<"). Default is GIT_MERGE_CONFLICT_MARKER_SIZE.

Returned By

Parameter To

Versions