git/merge-blobs.c

#define USE_THE_REPOSITORY_VARIABLE

#include "git-compat-util.h"
#include "merge-ll.h"
#include "blob.h"
#include "merge-blobs.h"
#include "object-store-ll.h"

static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
{ … }

static void free_mmfile(mmfile_t *f)
{ … }

static void *three_way_filemerge(struct index_state *istate,
				 const char *path,
				 mmfile_t *base,
				 mmfile_t *our,
				 mmfile_t *their,
				 unsigned long *size)
{ … }

void *merge_blobs(struct index_state *istate, const char *path,
		  struct blob *base, struct blob *our,
		  struct blob *their, unsigned long *size)
{ … }