git_merge_file

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.

extern (C) nothrow @nogc public
int
git_merge_file

Parameters

out_ .git_merge_file_result*

The git_merge_file_result to be filled in

ancestor const(.git_merge_file_input)*

The contents of the ancestor file

ours const(.git_merge_file_input)*

The contents of the file in "our" side

theirs const(.git_merge_file_input)*

The contents of the file in "their" side

opts const(.git_merge_file_options)*

The merge file options or null for defaults

Return Value

Type: int

0 on success or error code

Meta