mharbison72 created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH stable REVISION DETAIL https://phab.mercurial-scm.org/D12605 AFFECTED FILES mercurial/commands.py tests/test-help.t CHANGE DETAILS diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -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 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2537,7 +2537,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 To: mharbison72, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
