merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/merge-recursive.c b/merge-recursive.c
index b9bc95a659bf2a76b20b64b4b2783bc3acb9a97c..6ffc67ade4dc0ceee604596d4a5fb6baad42ac43 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1061,6 +1061,7 @@ static int process_renames(struct merge_options *o,
                                                    mfi.sha,
                                                    mfi.mode,
                                                    ren1_dst);
+                                       try_merge = 0;
                                } else {
                                        new_path = unique_path(o, ren1_dst, branch2);
                                        output(o, 1, "Adding as %s instead", new_path);