[Updated] D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs

[durin42 (Augie Fackler)]

durin42 edited the summary of this revision.

REPOSITORY
  rHG Mercurial

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

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

To: durin42, #hg-reviewers
Cc: marmoute, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200609/b6e214fc/attachment-0001.html>