Imported Upstream version 2.5.0

[platform/upstream/git.git] / builtin / merge-tree.c

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 2a4aafe..f9ab485 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -118,8 +118,7 @@ static void show_diff(struct merge_list *entry)
        if (!dst.ptr)
                size = 0;
        dst.size = size;
-       if (xdi_diff(&src, &dst, &xpp, &xecfg, &ecb))
-               die("unable to generate diff");
+       xdi_diff(&src, &dst, &xpp, &xecfg, &ecb);
        free(src.ptr);
        free(dst.ptr);
 }