X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=e08324686cc090fa9bd94d7f069b025454c7acdf;hb=4c750c0d8bfd7e75b86d660def012bff17d2bf8e;hp=7d4f628444058d80e798e141285d558fb7104c5b;hpb=071a8877662974f588dfc0b1ac7df2764b7e0337;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 7d4f62844..e08324686 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -119,7 +119,7 @@ static void show_diff(struct merge_list *entry)
 	if (!dst.ptr)
 		size = 0;
 	dst.size = size;
-	xdl_diff(&src, &dst, &xpp, &xecfg, &ecb);
+	xdi_diff(&src, &dst, &xpp, &xecfg, &ecb);
 	free(src.ptr);
 	free(dst.ptr);
 }