It is not at all clear what 'mr' was supposed to stand for, at least not
to me.  Pick a clearer name for this variable.

Signed-off-by: Elijah Newren <new...@gmail.com>
---
 merge-recursive.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 8114e77b98..f36962b7b5 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3482,7 +3482,7 @@ static int merge_recursive_internal(struct merge_options 
*opt,
 {
        struct commit_list *iter;
        struct commit *merged_merge_bases;
-       struct tree *mrtree;
+       struct tree *result_tree;
        int clean;
 
        if (show(opt, 4)) {
@@ -3552,14 +3552,15 @@ static int merge_recursive_internal(struct 
merge_options *opt,
                                     repo_get_commit_tree(opt->repo, h2),
                                     repo_get_commit_tree(opt->repo,
                                                          merged_merge_bases),
-                                    &mrtree);
+                                    &result_tree);
        if (clean < 0) {
                flush_output(opt);
                return clean;
        }
 
        if (opt->call_depth) {
-               *result = make_virtual_commit(opt->repo, mrtree, "merged tree");
+               *result = make_virtual_commit(opt->repo, result_tree,
+                                             "merged tree");
                commit_list_insert(h1, &(*result)->parents);
                commit_list_insert(h2, &(*result)->parents->next);
        }
-- 
2.22.0.550.g71c37a0928.dirty

Reply via email to