iframe-proxy | Sunbelt Computer Software

This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Repository navigation

#include <cppgit2/merge.hpp>

using namespace cppgit2;

merge::file::result merge::merge_files(const merge::file::input &ancestor,

const merge::file::input &ours,

const merge::file::input &theirs,

const merge::file::options &options) {

git_merge_file_result result;

if (git_merge_file(&result, ancestor.c_ptr(), ours.c_ptr(), theirs.c_ptr(),

options.c_ptr()))

throw git_exception();

return merge::file::result(&result);

}