libgit2

git_index_conflict_get

Version:

Get the index entries that represent a conflict of a single file.

The entries are not modifiable and should not be freed. Because the git_index_entry struct is a publicly defined struct, you should be able to make your own permanent copy of the data if necessary.

Signature

GitHub
int git_index_conflict_get(const git_index_entry **ancestor_out, const git_index_entry **our_out, const git_index_entry **their_out, git_index *index, const char *path);

Parameters

const git_index_entry **
In
ancestor_out

Pointer to store the ancestor entry

const git_index_entry **
In
our_out

Pointer to store the our entry

const git_index_entry **
In
their_out

Pointer to store the their entry

git_index *
In
index

an existing index object

const char *
In
path

path to search

Returns

int

0 or an error code

Versions