Merge branch 'sb/packfiles-in-repository' into next

diff --git a/merge-recursive.c b/merge-recursive.c
index 408d30e300742cd68de1e9461e47707779377054..9c05eb7f700eed0dc3e20a4c22f3a60e0aa21488 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3111,7 +3111,7 @@ int merge_recursive(struct merge_options *o,
 {
        struct commit_list *iter;
        struct commit *merged_common_ancestors;
-       struct tree *mrtree = mrtree;
+       struct tree *mrtree;
        int clean;
 
        if (show(o, 4)) {