merge-recur: Fix compiler warning with -pedantic
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin committed
Jul 27, 2006 at 19:13 UTC
7b3f5daabc9fcfffc632a6a963cf5466745b7dbd
1 file changed
+4
-1
merge-recursive.c
+4
-1
@@ -642,7 +642,7 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
642
char src2[PATH_MAX];
643
const char *argv[] = {
644
"merge", "-L", NULL, "-L", NULL, "-L", NULL,
645
- src1, orig, src2,
645
+ NULL, NULL, NULL,
646
NULL
647
};
648
char *la, *lb, *lo;
@@ -654,6 +654,9 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
654
argv[2] = la = strdup(mkpath("%s/%s", branch1Name, a->path));
655
argv[6] = lb = strdup(mkpath("%s/%s", branch2Name, b->path));
656
argv[4] = lo = strdup(mkpath("orig/%s", o->path));
657
+ argv[7] = src1;
658
+ argv[8] = orig;
659
+ argv[9] = src2,
660
661
code = run_command_v(10, argv);
662