summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-06 15:26:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-06 18:00:24 (GMT)
commitba1f5f353775ddbf97bc0d543888783630693023 (patch)
tree2b12778fc9f164fd3acbc3c5ccc95846096c741b /builtin.h
parent98e6da8a360b77af2924e8056fd951013835699b (diff)
downloadgit-ba1f5f353775ddbf97bc0d543888783630693023.zip
git-ba1f5f353775ddbf97bc0d543888783630693023.tar.gz
git-ba1f5f353775ddbf97bc0d543888783630693023.tar.bz2
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index b5116f3..08519e7 100644
--- a/builtin.h
+++ b/builtin.h
@@ -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);