Ignore merged status of the file-level merge
[git/git.git] / merge-recursive.c
index 094ac59..8f72b2c 100644 (file)
@@ -1342,7 +1342,7 @@ static int process_renames(struct path_list *a_renames,
                                mfi = merge_file(o, a, b,
                                                a_branch, b_branch);
 
-                               if (mfi.merge && mfi.clean &&
+                               if (mfi.clean &&
                                    sha_eq(mfi.sha, ren1->pair->two->sha1) &&
                                    mfi.mode == ren1->pair->two->mode)
                                        /*