diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-07 19:24:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 17:50:01 -0700 |
| commit | 1c7b76be7d620bbaf2e6b8417f04012326bbb9df (patch) | |
| tree | 1245fa311746c7d0c0ec78a7d773a57edb5460a5 /builtin.h | |
| parent | 1c6669351a47c834cceb75d6044a1aae259fc69f (diff) | |
| download | git-1c7b76be7d620bbaf2e6b8417f04012326bbb9df.tar.gz | |
Build in merge
Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -64,6 +64,7 @@ extern int cmd_ls_tree(int argc, const char **argv, const char *prefix); extern int cmd_ls_remote(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(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); |