[Updated] D11506: dirstate: use a new `drop_merge_data` in `setparent`

[Alphare (Raphaël Gomès)]

This revision is now accepted and ready to land.
Alphare accepted this revision.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11506/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11506

To: SimonSapin, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210930/3ada8505/attachment-0002.html>