--- a/mercurial/merge.py	Fri Jul 24 16:18:39 2020 +0530
+++ b/mercurial/merge.py	Fri Jul 24 16:23:55 2020 +0530
@@ -576,6 +576,11 @@
         """
         self._actions[filename] = (action, data, message)
 
+    def removefile(self, filename):
+        """ removes a file from the mergeresult object as the file might
+        not merging anymore """
+        del self._actions[filename]
+
     @property
     def actions(self):
         return self._actions
@@ -1929,7 +1934,7 @@
                         b'prompt recreating',
                     )
                 else:
-                    del mresult.actions[f]
+                    mresult.removefile(f)
 
         # Convert to dictionary-of-lists format
         actions = mresult.actionsdict