merge-recursive: check for file level conflicts then get new name
[git/git-svn.git] / mailmap.h
blobed7c93b05c3cc904c3052bae199346a698eec1e6
1 #ifndef MAILMAP_H
2 #define MAILMAP_H
4 int read_mailmap(struct string_list *map, char **repo_abbrev);
5 void clear_mailmap(struct string_list *map);
7 int map_user(struct string_list *map,
8 const char **email, size_t *emaillen, const char **name, size_t *namelen);
10 #endif