changeset 48763 | 93d6f0e7ba2f |
parent 48761 | 7dad4665d223 |
child 48775 | b70c9697ab41 |
--- a/mercurial/filemerge.py Mon Feb 07 20:12:09 2022 -0800 +++ b/mercurial/filemerge.py Mon Feb 07 22:54:38 2022 -0800 @@ -989,10 +989,6 @@ Returns whether the merge is complete, the return value of the merge, and a boolean indicating whether the file was deleted from disk.""" - - if not fco.cmp(fcd): # files identical? - return None, False - ui = repo.ui fd = fcd.path() uipathfn = scmutil.getuipathfn(repo)