git/builtin/merge-file.c

#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h"
#include "abspath.h"
#include "diff.h"
#include "hex.h"
#include "object-name.h"
#include "object-store.h"
#include "config.h"
#include "gettext.h"
#include "setup.h"
#include "xdiff/xdiff.h"
#include "xdiff-interface.h"
#include "parse-options.h"

static const char *const merge_file_usage[] = …;

static int label_cb(const struct option *opt, const char *arg, int unset)
{ … }

static int set_diff_algorithm(xpparam_t *xpp,
			      const char *alg)
{ … }

static int diff_algorithm_cb(const struct option *opt,
				const char *arg, int unset)
{ … }

int cmd_merge_file(int argc,
		   const char **argv,
		   const char *prefix,
		   struct repository *repo UNUSED)
{ … }