Ignore merged status of the file-level merge
as it is not relevant for whether the result should be written. Even if no real merge happened, there might be _no_ reason to rewrite the working tree file. Maybe even more so. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen committed
Apr 26, 2007 at 21:13 UTC
0d5e6c9781aae33795243452fd50663d17ec2b9d
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1342,7 +1342,7 @@ static int process_renames(struct path_list *a_renames,
1342
mfi = merge_file(o, a, b,
1343
a_branch, b_branch);
1344
1345
- if (mfi.merge && mfi.clean &&
1345
+ if (mfi.clean &&
1346
sha_eq(mfi.sha, ren1->pair->two->sha1) &&
1347
mfi.mode == ren1->pair->two->mode)
1348
/*