diff tests/test-help.t @ 49172:5ad37b5bfb31

diff: add help text to highlight the ability to do "merge diffs"

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

--- 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