X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin.h;h=f2a25a084736e573f560672fabc9c6214997f437;hb=d577cd216e0adb9cbc726dddd1a0858b4ab4e6e3;hp=ed6ee26933430e1db4e29e62badfaf0b217935ad;hpb=0a4139b5f283ef5e817afaafd9e7e2a149220cc4;p=git.git

diff --git a/builtin.h b/builtin.h
index ed6ee2693..f2a25a084 100644
--- a/builtin.h
+++ b/builtin.h
@@ -7,16 +7,15 @@
 #include "commit.h"
 #include "notes.h"
 
+#define DEFAULT_MERGE_LOG_LEN 20
+
 extern const char git_version_string[];
 extern const char git_usage_string[];
 extern const char git_more_info_string[];
 
-extern void list_common_cmds_help(void);
-extern const char *help_unknown_cmd(const char *cmd);
 extern void prune_packed_objects(int);
-extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
-	struct strbuf *out);
-extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);
+extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+			 int merge_title, int shortlog_len);
 extern int commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {