merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/shortlog.h b/shortlog.h
index 31ff491b7448f69385cddb640819e7ea14e2fb3e..de4f86fb970e15491f44dfe38b7d7d6fdc3be9ad 100644 (file)
--- a/shortlog.h
+++ b/shortlog.h
@@ -1,20 +1,22 @@
 #ifndef SHORTLOG_H
 #define SHORTLOG_H
 
-#include "path-list.h"
+#include "string-list.h"
 
 struct shortlog {
-       struct path_list list;
+       struct string_list list;
        int summary;
        int wrap_lines;
        int sort_by_number;
        int wrap;
        int in1;
        int in2;
+       int user_format;
+       int abbrev;
 
        char *common_repo_prefix;
        int email;
-       struct path_list mailmap;
+       struct string_list mailmap;
 };
 
 void shortlog_init(struct shortlog *log);