diff-tree: convert diff_tree_sha1 to struct object_id

diff --git a/builtin/merge.c b/builtin/merge.c
index a4a098f40f8e3e61c3f8b730a6b22a83c3c23566..afaed6a2c2fa4d426e440b2bdcc7bb0461253449 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -415,7 +415,7 @@ static void finish(struct commit *head_commit,
                        DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
                opts.detect_rename = DIFF_DETECT_RENAME;
                diff_setup_done(&opts);
-               diff_tree_sha1(head->hash, new_head->hash, "", &opts);
+               diff_tree_oid(head, new_head, "", &opts);
                diffcore_std(&opts);
                diff_flush(&opts);
        }