compat: Add simplified merge sort implementation from glibc

diff --git a/merge-tree.c b/merge-tree.c
index 3b8d9e6887ae051bf61cc0833f97d83bb47a0bae..e08324686cc090fa9bd94d7f069b025454c7acdf 100644 (file)
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -106,8 +106,8 @@ static void show_diff(struct merge_list *entry)
        xdemitcb_t ecb;
 
        xpp.flags = XDF_NEED_MINIMAL;
+       memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = 3;
-       xecfg.flags = 0;
        ecb.outf = show_outf;
        ecb.priv = NULL;
 
@@ -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);
 }