diff options
| author | Thomas Harning <harningt@gmail.com> | 2007-11-22 15:19:40 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-22 14:21:59 -0800 |
| commit | a00a42ae33708caa742d9e9fbf10692cfa42f032 (patch) | |
| tree | d14676ffff8533ab5edd6c9bc790097c6f7e5dd6 /builtin.h | |
| parent | a7d9da6c972cb7bc79ef47ad7199dfb2a8dcf67f (diff) | |
| download | git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.gz git-a00a42ae33708caa742d9e9fbf10692cfa42f032.tar.xz | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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); |