/*
* Builtin "git merge"
*
* Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
*
* Based on git-merge.sh by Junio C Hamano.
*/#include"cache.h"#include"parse-options.h"#include"builtin.h"#include"run-command.h"#include"diff.h"#include"refs.h"#include"commit.h"#include"diffcore.h"#include"revision.h"#include"unpack-trees.h"#include"cache-tree.h"#include"dir.h"#include"utf8.h"#include"log-tree.h"#include"color.h"#include"rerere.h"#include"help.h"#include"merge-recursive.h"#include"resolve-undo.h"#include"remote.h"#include"fmt-merge-msg.h"#include"gpg-interface.h"#define DEFAULT_TWOHEAD (1<<0)