/*
* Builtin "git merge"
*
* Copyright (c) 2008 Miklos Vajna <vmiklos@frugalware.org>
*
* Based on git-merge.sh by Junio C Hamano.
*/#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include"cache.h"#include"config.h"#include"parse-options.h"#include"builtin.h"#include"lockfile.h"#include"run-command.h"#include"diff.h"#include"refs.h"#include"refspec.h"#include"commit.h"#include"diffcore.h"#include