From 0ecace728f8e48b87f81433b053d7f277f22e674 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 22 Jan 2010 07:29:21 -0800 Subject: make "merge-index" a built-in Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- builtin.h | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin.h') diff --git a/builtin.h b/builtin.h index cb8489f97..e961b3342 100644 --- a/builtin.h +++ b/builtin.h @@ -68,6 +68,7 @@ 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(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_index(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_merge_recursive(int argc, const char **argv, const char *prefix); -- cgit v1.2.1