[Accepted] D11551: dirstate: remove a update_file's special case for `merged` file

[pulkit (Pulkit Goyal)]

pulkit accepted this revision.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

To: marmoute, #hg-reviewers, Alphare, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211012/17a90a5d/attachment-0002.html>