X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=builtin.h;h=322901f339a47486854d90048cbec198db8fce56;hb=12575b78fbc6db9eb8de12c8146c7d27eb821e09;hp=464588b299a473e9e1ee58cbc61e2f981030e37d;hpb=890a13a45285ad44858add2ce2f74eb478f549c8;p=git.git

diff --git a/builtin.h b/builtin.h
index 464588b29..322901f33 100644
--- a/builtin.h
+++ b/builtin.h
@@ -16,6 +16,7 @@ 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 commit_tree(const char *msg, unsigned char *tree,
 		struct commit_list *parents, unsigned char *ret,
 		const char *author);