Mercurial > hg

changeset 49172:5ad37b5bfb31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: add help text to highlight the ability to do "merge diffs" Differential Revision: https://phab.mercurial-scm.org/D12605
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 04 May 2022 13:39:49 -0400
parents 2c0570a6d5ae
children 90f7d8276e26
files mercurial/commands.py tests/test-help.t
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon May 02 12:10:28 2022 +0400
+++ b/mercurial/commands.py	Wed May 04 13:39:49 2022 -0400
@@ -2536,7 +2536,8 @@
 
        :hg:`diff` may generate unexpected results for merges, as it will
        default to comparing against the working directory's first
-       parent changeset if no revisions are specified.
+       parent changeset if no revisions are specified.  To diff against the
+       conflict regions, you can use `--config diff.merge=yes`.
 
     By default, the working directory files are compared to its first parent. To
     see the differences from another revision, use --from. To see the difference
--- a/tests/test-help.t	Mon May 02 12:10:28 2022 +0400
+++ b/tests/test-help.t	Wed May 04 13:39:49 2022 -0400
@@ -644,7 +644,8 @@
       Note:
          'hg diff' may generate unexpected results for merges, as it will
          default to comparing against the working directory's first parent
-         changeset if no revisions are specified.
+         changeset if no revisions are specified.  To diff against the conflict
+         regions, you can use '--config diff.merge=yes'.
   
       By default, the working directory files are compared to its first parent.
       To see the differences from another revision, use --from. To see the