git_merge_file_from_index

Merge two files as they exist in the index, using the given common ancestor as the baseline, producing a git_merge_file_result that reflects the merge result. The git_merge_file_result must be freed with git_merge_file_result_free.

extern (C) nothrow @nogc

int

(

.git_merge_file_result* out_

libgit2_d.types.git_repository* repo

const(libgit2_d.index.git_index_entry)* ancestor

const(libgit2_d.index.git_index_entry)* ours

const(libgit2_d.index.git_index_entry)* theirs

const(.git_merge_file_options)* opts

)

Parameters

out_ .git_merge_file_result*: The git_merge_file_result to be filled in
repo libgit2_d.types.git_repository*: The repository
ancestor const(libgit2_d.index.git_index_entry)*: The index entry for the ancestor file (stage level 1)
ours const(libgit2_d.index.git_index_entry)*: The index entry for our file (stage level 2)
theirs const(libgit2_d.index.git_index_entry)*: The index entry for their file (stage level 3)
opts const(.git_merge_file_options)*: The merge file options or null

Return Value

Type: int

0 on success or error code

git_merge_file_from_index

Parameters

Return Value

Meta

Source