diff -r 142e9f0a70b5 -r e2753a7acfa7 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Wed Sep 29 02:06:04 2021 +0200
+++ b/mercurial/dirstate.py	Fri Oct 01 04:04:38 2021 +0200
@@ -1372,7 +1372,7 @@
 
             if not st and t.tracked:
                 dadd(fn)
-            elif t.merged or t.from_p2:
+            elif t.p2_info:
                 madd(fn)
             elif t.added:
                 aadd(fn)