[Accepted] D8941: merge: add missing ACTION_KEEP when both remote and ancestor are not present

[marmoute (Pierre-Yves David)]

marmoute accepted this revision.

REPOSITORY
  rHG Mercurial

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

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

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