Merge two commits, producing a git_index that reflects the result of
the merge. The index may be written as-is to the working directory
or checked out. If the index is to be converted to a tree, the caller
should resolve any conflicts that arose as part of the merge.
The returned index must be freed explicitly with git_index_free.
@param out_ pointer to store the index result in
@param repo repository that contains the given trees
@param our_commit the commit that reflects the destination tree
@param their_commit the commit to merge in to our_commit
@param opts the merge tree options (or null for defaults)
@return 0 on success or error code
Merge two commits, producing a git_index that reflects the result of the merge. The index may be written as-is to the working directory or checked out. If the index is to be converted to a tree, the caller should resolve any conflicts that arose as part of the merge.
The returned index must be freed explicitly with git_index_free.
@param out_ pointer to store the index result in @param repo repository that contains the given trees @param our_commit the commit that reflects the destination tree @param their_commit the commit to merge in to our_commit @param opts the merge tree options (or null for defaults) @return 0 on success or error code