Revision 6c0efa2ac07f275c1edd11ae6646a647d7f19f36 authored by Junio C Hamano on 26 October 2009, 01:37:56 UTC, committed by Junio C Hamano on 26 October 2009, 01:37:56 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 47a876a
builtin-merge-ours.c
/*
* Implementation of git-merge-ours.sh as builtin
*
* Copyright (c) 2007 Thomas Harning Jr
* Original:
* Original Copyright (c) 2005 Junio C Hamano
*
* Pretend we resolved the heads, but declare our tree trumps everybody else.
*/
#include "git-compat-util.h"
#include "builtin.h"
static const char *diff_index_args[] = {
"diff-index", "--quiet", "--cached", "HEAD", "--", NULL
};
#define NARGS (ARRAY_SIZE(diff_index_args) - 1)
int cmd_merge_ours(int argc, const char **argv, const char *prefix)
{
/*
* We need to exit with 2 if the index does not match our HEAD tree,
* because the current index is what we will be committing as the
* merge result.
*/
if (cmd_diff_index(NARGS, diff_index_args, prefix))
exit(2);
exit(0);
}
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...