diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-06 16:26:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 10:00:24 -0800 |
| commit | ba1f5f353775ddbf97bc0d543888783630693023 (patch) | |
| tree | 2b12778fc9f164fd3acbc3c5ccc95846096c741b /builtin.h | |
| parent | 98e6da8a360b77af2924e8056fd951013835699b (diff) | |
| download | git-ba1f5f353775ddbf97bc0d543888783630693023.tar.gz git-ba1f5f353775ddbf97bc0d543888783630693023.tar.xz | |
Add builtin merge-file, a minimal replacement for RCS merge
merge-file has the same syntax as RCS merge, but supports only the
"-L" option.
For good measure, a test is added, which is quite minimal, though.
[jc: further fix for compliation errors included.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin.h')
| -rw-r--r-- | builtin.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -42,6 +42,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_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); extern int cmd_pack_objects(int argc, const char **argv, const char *prefix); |