Merge branch 'js/fuzz-cxxflags'

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 8fc108d305a33c4ba615837b60bda8175f2fb882..70f6fc916765c5a5ca67c2dfe72e0480128182e3 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -110,7 +110,8 @@ static void show_diff(struct merge_list *entry)
        xpp.flags = 0;
        memset(&xecfg, 0, sizeof(xecfg));
        xecfg.ctxlen = 3;
-       ecb.outf = show_outf;
+       ecb.out_hunk = NULL;
+       ecb.out_line = show_outf;
        ecb.priv = NULL;
 
        src.ptr = origin(entry, &size);