[Commented On] D9956: diff: replace --merge option by config option

[marmoute (Pierre-Yves David)]

marmoute added a comment.


  In D9956#150837 <https://phab.mercurial-scm.org/D9956#150837>, @martinvonz wrote:
  
  > In D9956#150835 <https://phab.mercurial-scm.org/D9956#150835>, @marmoute wrote:
  >
  >> This seems too premature for a quite new feature we don't have much experience with.
  >> The current behavior for diff on merge is well established and have valid usecase (eg: when doing traversal following first parents). Keeping this as an explicit flag for now seems preferable.
  >
  > I'm confused about your comment. Do you plan to test it frequently enough that you want to be able to turn it on and off with `--merge` instead of `--config diff.merge=yes`? You noticed that it's an experimental flag that turned into an experimental config, right?
  
  Yes. The flag (with --merge and --no-merge variant) seems like a good idea, at least for a while. We can have a config to change the default flag value (while keeping the flag).

REPOSITORY
  rHG Mercurial

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

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

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