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

[marmoute (Pierre-Yves David)]

marmoute added a comment.


  In D8515#128781 <https://phab.mercurial-scm.org/D8515#128781>, @durin42 wrote:
  
  > 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.
  
  Can you also clearly state the intended usage in the  documentation of the merge tool itself. Can you update you update diff in that direction ?

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/20200610/7b9e2e9b/attachment-0002.html>