simplify output of conflicting merge

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index bcefa52c69481ceb301a96af6402ca2a029144fb..8ca46c8deb09a4c7d32947033eab804b108e0a34 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
                max_size = trg_entry->delta_size;
                ref_depth = trg->depth;
        }
-       max_size = max_size * (max_depth - src->depth) /
+       max_size = (uint64_t)max_size * (max_depth - src->depth) /
                                                (max_depth - ref_depth + 1);
        if (max_size == 0)
                return 0;