dirstate-item: replace a `merged` usage with `p2_info`
It seems more accurate and no test complains (XXX hopefully XXX).
Differential Revision: https://phab.mercurial-scm.org/D11595
--- a/mercurial/dirstatemap.py Fri Oct 01 03:26:12 2021 +0200
+++ b/mercurial/dirstatemap.py Fri Oct 01 03:28:01 2021 +0200
@@ -162,7 +162,7 @@
return False
else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
- if not entry.merged:
+ if not entry.p2_info:
self.copymap.pop(f, None)
entry.set_untracked()
self._refresh_entry(f, entry)