libgit2

git_index_conflict_get

Version:

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

The values of this entry can be modified (except the paths) and the changes will be written back to disk on the next write() call.

Signature

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

Parameters

git_index_entry **
In
ancestor_out

Pointer to store the ancestor entry

git_index_entry **
In
our_out

Pointer to store the our entry

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

Versions