summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorThomas Harning <harningt@gmail.com>2007-11-22 20:19:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-22 22:21:59 (GMT)
commita00a42ae33708caa742d9e9fbf10692cfa42f032 (patch)
treed14676ffff8533ab5edd6c9bc790097c6f7e5dd6 /builtin.h
parenta7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f (diff)
downloadgit-a00a42ae33708caa742d9e9fbf10692cfa42f032.zip
git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.gz
git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.bz2
git-merge-ours: make it a builtin.
Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: Thomas Harning Jr <harningt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index 9a6213a..bcb54aa 100644
--- a/builtin.h
+++ b/builtin.h
@@ -51,6 +51,7 @@ extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
+extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
extern int cmd_mv(int argc, const char **argv, const char *prefix);
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);