[Accepted] D10148: mergestate: don't pop stateextras when there are no conflicts on filemerge

[Alphare (Raphaël Gomès)]

Alphare accepted this revision.

REPOSITORY
  rHG Mercurial

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

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

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