Tenth batch for 2.14

diff --git a/builtin/merge.c b/builtin/merge.c
index eab03a026d26aaf6b42fb43a363b67857660a763..84970cd85e8b0788928ff24b47c8c1b3dc3409e2 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);
        }