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

[marmoute (Pierre-Yves David)]

marmoute edited the summary of this revision.

REPOSITORY
  rHG Mercurial

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/20210929/148db2e0/attachment-0002.html>