Sync with maint

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index cdeb6562da43b039eca1dd822c43f8e780d34e01..bad6735c76fd0647547edfd1201d91c3c86dfc8f 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -168,7 +168,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru
        res->stage = stage;
        res->path = path;
        res->mode = mode;
-       res->blob = lookup_blob(oid->hash);
+       res->blob = lookup_blob(oid);
        return res;
 }