--- a/mercurial/commands.py Mon Aug 10 15:09:44 2020 +0530
+++ b/mercurial/commands.py Mon Aug 10 15:29:02 2020 +0530
@@ -5969,8 +5969,6 @@
if not m(f):
continue
- if ms[f] == mergestatemod.MERGE_RECORD_MERGED_OTHER:
- continue
label, key = mergestateinfo[ms[f]]
fm.startitem()
fm.context(ctx=wctx)
@@ -6018,9 +6016,6 @@
didwork = True
- if ms[f] == mergestatemod.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] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED: