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.
@param out_ The git_merge_file_result to be filled in
@param repo The repository
@param ancestor The index entry for the ancestor file (stage level 1)
@param ours The index entry for our file (stage level 2)
@param theirs The index entry for their file (stage level 3)
@param opts The merge file options or null
@return 0 on success or error code
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.
@param out_ The git_merge_file_result to be filled in @param repo The repository @param ancestor The index entry for the ancestor file (stage level 1) @param ours The index entry for our file (stage level 2) @param theirs The index entry for their file (stage level 3) @param opts The merge file options or null @return 0 on success or error code