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

[durin42 (Augie Fackler)]

durin42 added inline comments.

INLINE COMMENTS

> martinvonz wrote in commands.py:2413
> How about making this boolean-valued instead? I'd expect `hg diff --merge -c <some merge commit>` to work. That will also make it easy to provide a config option to always enable it. (I don't ever want the current behavior for `-c` with merge commits.)

Wow, that feels obvious in hindsight. And then we can also default-true when tweakdefaults is on.

> martinvonz wrote in test-diff-change.t:187
> We should have at least one test showing a "four-way diff" with base, left, right, and resolved states.

Not sure what you mean. Can you elaborate?

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
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200511/f2198fbd/attachment-0002.html>