Merge branch 'ap/branch'

diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index e2a0058435d396161145221eab80205a934b271c..91a699d34d93462b56f2591193bb5729b42b3950 100644 (file)
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -138,7 +138,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;