diff -r 292962570857 -r 588068d5f2da mercurial/merge.py
--- a/mercurial/merge.py	Fri Oct 02 07:56:01 2020 -0700
+++ b/mercurial/merge.py	Fri Oct 02 18:40:39 2020 +0530
@@ -1223,7 +1223,6 @@
             if (
                 mergestatemod.ACTION_CHANGED_DELETED in bids
                 and mergestatemod.ACTION_KEEP_NEW in bids
-                and len(bids) == 2
             ):
                 repo.ui.note(_(b" %s: picking 'changed/deleted' action\n") % f)
                 mresult.addfile(
@@ -1243,7 +1242,6 @@
             if (
                 mergestatemod.ACTION_DELETED_CHANGED in bids
                 and mergestatemod.ACTION_GET in bids
-                and len(bids) == 2
             ):
                 repo.ui.note(_(b" %s: picking 'delete/changed' action\n") % f)
                 mresult.addfile(