[PATCH 4/6] merge-recur: Fix compiler warning with -pedantic

From

Johannes Schindelin <johannes.schindelin@gmx.de>

Date

Jul 27, 2006, 17:13 UTC

Message-ID

<Pine.LNX.4.63.0607271913140.29667@wbgn013.biozentrum.uni-wuerzburg.de>

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 merge-recursive.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 9a86cdb..645ef8c 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -642,7 +642,7 @@ static struct merge_file_info merge_file
 			char src2[PATH_MAX];
 			const char *argv[] = {
 				"merge", "-L", NULL, "-L", NULL, "-L", NULL,
-				src1, orig, src2,
+				NULL, NULL, NULL,
 				NULL
 			};
 			char *la, *lb, *lo;
@@ -654,6 +654,9 @@ static struct merge_file_info merge_file
 			argv[2] = la = strdup(mkpath("%s/%s", branch1Name, a->path));
 			argv[6] = lb = strdup(mkpath("%s/%s", branch2Name, b->path));
 			argv[4] = lo = strdup(mkpath("orig/%s", o->path));
+			argv[7] = src1;
+			argv[8] = orig;
+			argv[9] = src2,
 
 			code = run_command_v(10, argv);
 

-- 
1.4.2.rc2.g6a4e