X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-file.c;h=2a939c9dd835a7e7946eb1548e4cf637ae3ca329;hb=660b9c3a4e24ce9a2628f2ec88902e2384d1aade;hp=1e031eafe0c70eec092a53e8ab291b9887622b0e;hpb=d60a6a662fac58f833efde93c962314fd5d83541;p=git.git

diff --git a/merge-file.c b/merge-file.c
index 1e031eafe..2a939c9dd 100644
--- a/merge-file.c
+++ b/merge-file.c
@@ -71,7 +71,7 @@ static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
 	res->size = 0;
 
 	ecb.priv = res;
-	return xdl_diff(f1, f2, &xpp, &xecfg, &ecb);
+	return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
 }
 
 void *merge_file(struct blob *base, struct blob *our, struct blob *their, unsigned long *size)