[Updated] D12013: simplemerge: take arguments as annotated context objects

[Alphare (Raphaël Gomès)]

This revision now requires changes to proceed.
Alphare added inline comments.
Alphare requested changes to this revision.

INLINE COMMENTS

> simplemerge.py:520
>      else:
>          # localctx.flags() already has the merged flags (done in
>          # mergestate.resolve())

This is slightly out of date now

REPOSITORY
  rHG Mercurial

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

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

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