Merge branch 'rs/fgrep'

diff --git a/mailmap.h b/mailmap.h
index 3503fd2727b7cee39fe8eafcb18ad713b0a2c9e8..6e48f83cedd13e24d50cddf47f037791ddc5ad4b 100644 (file)
--- a/mailmap.h
+++ b/mailmap.h
@@ -1,7 +1,7 @@
 #ifndef MAILMAP_H
 #define MAILMAP_H
 
-int read_mailmap(struct path_list *map, const char *filename, char **repo_abbrev);
-int map_email(struct path_list *mailmap, const char *email, char *name, int maxlen);
+int read_mailmap(struct string_list *map, const char *filename, char **repo_abbrev);
+int map_email(struct string_list *mailmap, const char *email, char *name, int maxlen);
 
 #endif