Make 'traverse_tree()' use linked structure rather than 'const char *base'

[git.git] / builtin-merge-file.c

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 10ec63b17e6b16382f2b39e5c01cc6cf1dce448e..adce6d4635a4153428368073677cd74a9bafc045 100644 (file)
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"
@@ -5,9 +6,9 @@
 static const char merge_file_usage[] =
 "git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
 
-int cmd_merge_file(int argc, char **argv, char **envp)
+int cmd_merge_file(int argc, const char **argv, const char *prefix)
 {
-       char *names[3];
+       const char *names[3];
        mmfile_t mmfs[3];
        mmbuffer_t result = {NULL, 0};
        xpparam_t xpp = {XDF_NEED_MINIMAL};
@@ -45,13 +46,13 @@ int cmd_merge_file(int argc, char **argv, char **envp)
        }
 
        ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
-                       &xpp, XDL_MERGE_ZEALOUS, &result);
+                       &xpp, XDL_MERGE_ZEALOUS_ALNUM, &result);
 
        for (i = 0; i < 3; i++)
                free(mmfs[i].ptr);
 
        if (ret >= 0) {
-               char *filename = argv[1];
+               const char *filename = argv[1];
                FILE *f = to_stdout ? stdout : fopen(filename, "wb");
 
                if (!f)