X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-file.c;h=58deb62ac08507901c40e89aec0cea7fcdc78f1e;hb=f18b1c55e5b7478524c15685cd643555fc919f3f;hp=10ec63b17e6b16382f2b39e5c01cc6cf1dce448e;hpb=f26cacf4956b08238868b21a8eac6b5e51a17d7f;p=git.git

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 10ec63b17..58deb62ac 100644
--- 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};
@@ -51,7 +52,7 @@ int cmd_merge_file(int argc, char **argv, char **envp)
 		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)