git/merge-ort-wrappers.c

#include "git-compat-util.h"
#include "gettext.h"
#include "hash.h"
#include "merge-ort.h"
#include "merge-ort-wrappers.h"
#include "read-cache-ll.h"
#include "tree.h"

#include "commit.h"

static int unclean(struct merge_options *opt, struct tree *head)
{ … }

int merge_ort_nonrecursive(struct merge_options *opt,
			   struct tree *head,
			   struct tree *merge,
			   struct tree *merge_base)
{ … }

int merge_ort_recursive(struct merge_options *opt,
			struct commit *side1,
			struct commit *side2,
			const struct commit_list *merge_bases,
			struct commit **result)
{ … }