X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=combine-diff.c;fp=combine-diff.c;h=7557136c820a10570e72f6870ecc7a45c4c7ce36;hb=dfea79004c54bc96143386d6ac22de500ba4f747;hp=3480dae82416bda357dee2f0d545ac6dadc6a26f;hpb=ed215b109fc0e352456ea2ef6a0f8375e28466d5;p=git.git

diff --git a/combine-diff.c b/combine-diff.c
index 3480dae82..7557136c8 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -211,7 +211,6 @@ static void combine_diff(const unsigned char *parent, unsigned int mode,
 	xpparam_t xpp;
 	xdemitconf_t xecfg;
 	mmfile_t parent_file;
-	xdemitcb_t ecb;
 	struct combine_diff_state state;
 	unsigned long sz;
 
@@ -231,7 +230,7 @@ static void combine_diff(const unsigned char *parent, unsigned int mode,
 	state.n = n;
 
 	xdi_diff_outf(&parent_file, result_file, consume_line, &state,
-		      &xpp, &xecfg, &ecb);
+		      &xpp, &xecfg);
 	free(parent_file.ptr);
 
 	/* Assign line numbers for this parent.