abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing

diff --git a/merge-recursive.c b/merge-recursive.c
index e3db594da168a312134f9870606c04fa0995a3b9..3750d2534f5f2e9842375516eb75143a8e52d7fe 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -910,9 +910,9 @@ static int merge_3way(struct merge_options *o,
                name2 = mkpathdup("%s", branch2);
        }
 
-       read_mmblob(&orig, one->oid.hash);
-       read_mmblob(&src1, a->oid.hash);
-       read_mmblob(&src2, b->oid.hash);
+       read_mmblob(&orig, &one->oid);
+       read_mmblob(&src1, &a->oid);
+       read_mmblob(&src2, &b->oid);
 
        merge_status = ll_merge(result_buf, a->path, &orig, base_name,
                                &src1, name1, &src2, name2, &ll_opts);