[Updated] D8504: diff: add experimental support for "merge diffs"

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.
martinvonz accepted this revision.

INLINE COMMENTS

> commands.py:2566
> +        if diffmerge and ctx2.p2().node() != nullid:
> +            mctx = ctx2
> +            pctx1 = mctx.p1()

I'll do this in flight:

- Replace `ctx1` by `pctx1` on line 2570 (pushing down fix D9939 <https://phab.mercurial-scm.org/D9939> to here)
- Replace `mctx` uses by `ctx2`
- Drop `mctx`
- Drop reassignment to `ctx2` on line 2582
- Delete assignment to unused `stats` variable

REPOSITORY
  rHG Mercurial

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

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

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