merge-recursive: remove final remaining caller of merge_file_one()

diff --git a/shortlog.h b/shortlog.h
index 5a326c68602610d856ac543b8bd034542d83f64b..2fa61c42946262238ae2f1662ef3c2d1e981b274 100644 (file)
--- a/shortlog.h
+++ b/shortlog.h
@@ -3,6 +3,8 @@
 
 #include "string-list.h"
 
+struct commit;
+
 struct shortlog {
        struct string_list list;
        int summary;
@@ -13,6 +15,7 @@ struct shortlog {
        int in2;
        int user_format;
        int abbrev;
+       int committer;
 
        char *common_repo_prefix;
        int email;