--- a/mercurial/mergestate.py	Wed Jan 13 16:14:58 2021 +0100
+++ b/mercurial/mergestate.py	Wed Mar 10 13:08:41 2021 +0530
@@ -382,7 +382,6 @@
         if merge_ret is None:
             # If return value of merge is None, then there are no real conflict
             del self._state[dfile]
-            self._stateextras.pop(dfile, None)
             self._dirty = True
         elif not merge_ret:
             self.mark(dfile, MERGE_RECORD_RESOLVED)