Merge branch 'cj/p4merge'

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index f5efc67c9cad24fe54d5c6ab7257d38a4b1727ac..b6f4b0eb03b66dda2f691ff5c80b78321c1b701d 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -29,9 +29,6 @@ static int compare_by_number(const void *a1, const void *a2)
                return -1;
 }
 
-const char *format_subject(struct strbuf *sb, const char *msg,
-                          const char *line_separator);
-
 static void insert_one_record(struct shortlog *log,
                              const char *author,
                              const char *oneline)