mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-base' (early part)

Browse Source 
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
This commit is contained in:
Junio C Hamano
2007-02-13 16:50:32 -08:00
parent f8f2aaa172 03840fc32d
commit 4a164d48df
9 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin.h
View File

@ -44,6 +44,7 @@ extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
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_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);