[Updated] D8817: merge: move conversion of file-key dict to action-key dict in mergeresult

[indygreg (Gregory Szorc)]

This revision is now accepted and ready to land.
indygreg added inline comments.
indygreg accepted this revision.

INLINE COMMENTS

> merge.py:590
> +                actions[m] = []
> +            actions[m].append((f, args, msg))
> +

Nit: a more concise way of writing this is `actions.setdefault(m, []).append((f, args, msg))`

> merge.py:1824
>  
> -        actionbyfile = mresult.actions
> -

Thank you for removing this alias.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

To: pulkit, #hg-reviewers, indygreg
Cc: indygreg, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/9ed368ec/attachment.html>