diff -r b1e51ef4e536 -r d0ef8c1dddd4 mercurial/merge.py
--- a/mercurial/merge.py	Wed Jul 08 00:15:15 2020 +0200
+++ b/mercurial/merge.py	Mon Jul 06 03:43:32 2020 +0200
@@ -725,8 +725,7 @@
                             b'prompt changed/deleted',
                         )
                 elif n1 == addednodeid:
-                    # This extra 'a' is added by working copy manifest to mark
-                    # the file as locally added. We should forget it instead of
+                    # This file was locally added. We should forget it instead of
                     # deleting it.
                     actions[f] = (
                         mergestatemod.ACTION_FORGET,