Merge two files as they exist in the in-memory data structures, 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.
Note that this function does not reference a repository and any
configuration must be passed as git_merge_file_options.
@param out_ The git_merge_file_result to be filled in
@param ancestor The contents of the ancestor file
@param ours The contents of the file in "our" side
@param theirs The contents of the file in "their" side
@param opts The merge file options or null for defaults
@return 0 on success or error code
Merge two files as they exist in the in-memory data structures, 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.
Note that this function does not reference a repository and any configuration must be passed as git_merge_file_options.
@param out_ The git_merge_file_result to be filled in @param ancestor The contents of the ancestor file @param ours The contents of the file in "our" side @param theirs The contents of the file in "their" side @param opts The merge file options or null for defaults @return 0 on success or error code