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

[durin42 (Augie Fackler)]

durin42 added a comment.


  In D8515#128625 <https://phab.mercurial-scm.org/D8515#128625>, @marmoute wrote:
  
  > Is this to represent conflict for in-memory merge ? Or to help with the "merge diff" display ? Because I am not sure how it help (or is used) in the first case, but I can see it tremendously useful for mergediff (since it show how conflict got resolved)
  
  It's basically for mergediffs. I'll revise the commit message.

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://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200609/624024c0/attachment-0002.html>