diff --git a/merge-recursive.c b/merge-recursive.c
index 094ac59e69779621caf2872c8b4ee14242e89357..8f72b2c079a68ac5cb9d1c90bb7b72fa779efb5f 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
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)
/*