diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -989,10 +989,6 @@ def filemerge(repo, wctx, mynode, orig, 
 
     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)
diff --git a/mercurial/mergestate.py b/mercurial/mergestate.py
--- a/mercurial/mergestate.py
+++ b/mercurial/mergestate.py
@@ -421,6 +421,14 @@ class _mergestate_base(object):
             self._restore_backup(wctx[dfile], localkey, flags)
         else:
             wctx[dfile].remove(ignoremissing=True)
+
+        if not fco.cmp(fcd):  # files identical?
+            # If return value of merge is None, then there are no real conflict
+            del self._state[dfile]
+            self._results[dfile] = None, None
+            self._dirty = True
+            return None
+
         merge_ret, deleted = filemerge.filemerge(
             self._repo,
             wctx,
@@ -431,12 +439,6 @@ class _mergestate_base(object):
             fca,
             labels=self._labels,
         )
-        if merge_ret is None:
-            # If return value of merge is None, then there are no real conflict
-            del self._state[dfile]
-            self._results[dfile] = None, None
-            self._dirty = True
-            return None
 
         if not merge_ret:
             self.mark(dfile, MERGE_RECORD_RESOLVED)
diff --git a/tests/test-largefiles-misc.t b/tests/test-largefiles-misc.t
--- a/tests/test-largefiles-misc.t
+++ b/tests/test-largefiles-misc.t
@@ -962,7 +962,7 @@ Merge conflicts:
   what do you want to do? l
   getting changed largefiles
   1 largefiles updated, 0 removed
-  0 files updated, 4 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 3 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ cat f-different
   1