libgit2

git_merge_file_result

Version:

Information about file-level merging

Signature

typedef struct git_merge_file_result { unsigned int automergeable const char *path unsigned int mode const char *ptr size_t len };

Members

unsigned int
automergeable

True if the output was automerged, false if the output contains conflict markers.

const char *
path

The path that the resultant merge file should use, or NULL if a filename conflict would occur.

unsigned int
mode

The mode that the resultant merge file should use.

const char *
ptr

The contents of the merge.

size_t
len

The length of the merge contents.

Parameter To

Versions