X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin.h;h=f2a25a084736e573f560672fabc9c6214997f437;hb=ae5e97ec40a36408a8f90973c23e6143741ec732;hp=0398d247400e55f2a2ededc054902374c7516d5b;hpb=154adcf9c08218077275f7a4c7a6e61632516561;p=git.git

diff --git a/builtin.h b/builtin.h
index 0398d2474..f2a25a084 100644
--- a/builtin.h
+++ b/builtin.h
@@ -7,14 +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 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 {