commit 66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3
author Brandon Williams <bmwill@google.com> Tue May 30 10:31:03 2017 -0700
committer Junio C Hamano <gitster@pobox.com> Mon Jun 05 11:23:58 2017 +0900
tree 93238d8cef2a91c8792e591e2752bb1971543581
parent 9e5e0c289a900186b8943741cc632ea3bb6e1510

diff-tree: convert diff_tree_sha1 to struct object_id

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index a4a098f..afaed6a 100644
--- 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);
 	}