merge-recursive: restore accidentally dropped setting of path

diff --git a/merge-recursive.c b/merge-recursive.c
index 36af441faa0b562222853c27128b5a23de99e551..917b9229eb8695d93f78e355a8e702fe101ea76e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1655,6 +1655,7 @@ static int handle_rename_add(struct merge_options *opt,
               c->path, add_branch);
 
        prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
+       ci->ren1->src_entry->stages[other_stage].path = a->path;
        if (merge_mode_and_contents(opt, a, c,
                                    &ci->ren1->src_entry->stages[other_stage],
                                    prev_path_desc,