Allow the user to control the verbosity of merge-recursive.

diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index e2a0058435d396161145221eab80205a934b271c..3bca855aae857cde15f2a249f8e0a5c30b3e7d82 100644 (file)
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -4,13 +4,6 @@
  * It just splits a mbox into a list of files: "0001" "0002" ..
  * so you can process them further from there.
  */
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <stdio.h>
 #include "cache.h"
 #include "builtin.h"
 
@@ -138,7 +131,7 @@ int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec,
        free(name);
        return ret;
 }
-int cmd_mailsplit(int argc, const char **argv, char **envp)
+int cmd_mailsplit(int argc, const char **argv, const char *prefix)
 {
        int nr = 0, nr_prec = 4, ret;
        int allow_bare = 0;