.mailmap: Combine more (email, name) to individual persons

diff --git a/git.c b/git.c
index 88eef5a7cc6d36f6e17f4855945116dd6f1b0681..4359086fd6c47f1bfc3fc408b7bc986517eea9a0 100644 (file)
--- a/git.c
+++ b/git.c
@@ -514,8 +514,9 @@ static int run_argv(int *argcp, const char ***argv)
 }
 
 
-int main(int argc, const char **argv)
+int main(int argc, char **av)
 {
+       const char **argv = (const char **) av;
        const char *cmd;
 
        startup_info = &git_startup_info;