This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12605

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

Authored by mharbison72 on Wed, May 4, 3:46 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5ad37b5bfb31: diff: add help text to highlight the ability to do "merge diffs"
rHGa6cfc09dcb81: diff: add help text to highlight the ability to do "merge diffs"

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (3 lines)
Mtests/test-help.t (3 lines)

Diff 33380

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show differences between revisions for the specified files. Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format. Differences between files are shown using the unified diff format.
.. note:: .. note::
:hg:`diff` may generate unexpected results for merges, as it will :hg:`diff` may generate unexpected results for merges, as it will
default to comparing against the working directory's first 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 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 see the differences from another revision, use --from. To see the difference
to another revision, use --to. For example, :hg:`diff --from .^` will show to another revision, use --to. For example, :hg:`diff --from .^` will show
the differences from the working copy's grandparent to the working copy, the differences from the working copy's grandparent to the working copy,
:hg:`diff --to .` will show the diff from the working copy to its parent :hg:`diff --to .` will show the diff from the working copy to its parent
(i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
show the diff between those two revisions. show the diff between those two revisions.

tests/test-help.t

Show differences between revisions for the specified files. Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format. Differences between files are shown using the unified diff format.
Note: Note:
'hg diff' may generate unexpected results for merges, as it will 'hg diff' may generate unexpected results for merges, as it will
default to comparing against the working directory's first parent 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. By default, the working directory files are compared to its first parent.
To see the differences from another revision, use --from. To see the To see the differences from another revision, use --from. To see the
difference to another revision, use --to. For example, 'hg diff --from .^' difference to another revision, use --to. For example, 'hg diff --from .^'
will show the differences from the working copy's grandparent to the will show the differences from the working copy's grandparent to the
working copy, 'hg diff --to .' will show the diff from the working copy to working copy, 'hg diff --to .' will show the diff from the working copy to
its parent (i.e. the reverse of the default), and 'hg diff --from 1.0 --to its parent (i.e. the reverse of the default), and 'hg diff --from 1.0 --to
1.2' will show the diff between those two revisions. 1.2' will show the diff between those two revisions.