# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1651685989 14400
# Node ID 5ad37b5bfb31320c9d5e79791c33de90cf8c94c8
# Parent  2c0570a6d5ae7c063a7c9e606ff6c81a02bfd995
diff: add help text to highlight the ability to do "merge diffs"

Differential Revision: https://phab.mercurial-scm.org/D12605

diff -r 2c0570a6d5ae -r 5ad37b5bfb31 mercurial/commands.py
--- 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
diff -r 2c0570a6d5ae -r 5ad37b5bfb31 tests/test-help.t
--- 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