X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.c;h=6c6f595fbc7da09a41228e09cd2c5ef48b91f3f0;hb=265ae188267fda441f92e513fb89641f78e982fd;hp=4a5c77c3b632a9c0636848b933ef5395b01b7103;hpb=d55e7c3acf72413563e695a19f7f66efac442064;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 4a5c77c3b..6c6f595fb 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1572,7 +1572,7 @@ static int merge(struct commit *h1,
 {
 	struct commit_list *iter;
 	struct commit *merged_common_ancestors;
-	struct tree *mrtree;
+	struct tree *mrtree = mrtree;
 	int clean;
 
 	if (show(4)) {