diff -r bca57ad9e630 -r 1b8fd4af3318 mercurial/commands.py
--- a/mercurial/commands.py	Thu Apr 09 15:44:21 2020 -0400
+++ b/mercurial/commands.py	Thu Apr 09 16:06:03 2020 +0530
@@ -5955,6 +5955,8 @@
             if not m(f):
                 continue
 
+            if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
+                continue
             label, key = mergestateinfo[ms[f]]
             fm.startitem()
             fm.context(ctx=wctx)
@@ -6002,6 +6004,9 @@
 
             didwork = True
 
+            if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
+                continue
+
             # don't let driver-resolved files be marked, and run the conclude
             # step if asked to resolve
             if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED: