X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin.h;h=857b9c8aa85fff5764b528485a880cd9dfa95b17;hb=bc62ca13c03a7f73b7091c26093c552776b749ee;hp=f2357a94cf4ac9a7d03060df8e7b6507c968ea31;hpb=1bc01efed17c751e98fd6c5f9889759bfa9a8e9b;p=git.git

diff --git a/builtin.h b/builtin.h
index f2357a94c..857b9c8aa 100644
--- a/builtin.h
+++ b/builtin.h
@@ -14,8 +14,14 @@ extern const char git_usage_string[];
 extern const char git_more_info_string[];
 
 extern void prune_packed_objects(int);
+
+struct fmt_merge_msg_opts {
+	unsigned add_title:1;
+	int shortlog_len;
+};
+
 extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
-			 int merge_title, int shortlog_len);
+			 struct fmt_merge_msg_opts *);
 extern void commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {