[Commented On] D8816: merge: introduce hasconflicts() on mergeresult object

[indygreg (Gregory Szorc)]

indygreg added inline comments.

INLINE COMMENTS

> merge.py:587
> +        result in conflicts or not """
> +        for _, (m, _, _) in pycompat.iteritems(self._actions):
> +            if m not in (

pyflakes didn't like the shadowing of `_` here. So I changed variable names in flight.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

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/7af1604a/attachment-0001.html>