merge-recursive: handle D/F conflict case more carefully.

diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index 2ce1264f7b4bfb5baf85f82907e2a8f7219846fa..f0d4d9e2d10446a229094c991363f5a17ce4c666 100644 (file)
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -1,6 +1,3 @@
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
 #include "builtin.h"
 
 /*
@@ -54,7 +51,7 @@ void stripspace(FILE *in, FILE *out)
                fputc('\n', out);
 }
 
-int cmd_stripspace(int argc, const char **argv, char **envp)
+int cmd_stripspace(int argc, const char **argv, const char *prefix)
 {
        stripspace(stdin, stdout);
        return 0;