Mercurial > hg > mercurial-crew
changeset 28123:9ebc02157bf3
commands: the first word of each note should be capital or `hg`
author | timeless <timeless@mozdev.org> |
---|---|
date | Tue, 22 Dec 2015 02:24:16 +0000 |
parents | a2e2a8fa5fd1 |
children | 319d78cf787d |
files | mercurial/commands.py tests/test-help.t |
diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -542,7 +542,7 @@ .. note:: - backout cannot be used to fix either an unwanted or + :hg:`backout` cannot be used to fix either an unwanted or incorrect merge. .. container:: verbose @@ -3523,7 +3523,7 @@ .. note:: - 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 changeset if no revisions are specified. @@ -3614,7 +3614,7 @@ .. note:: - export may generate unexpected diff output for merge + :hg:`export` may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its first parent only. @@ -4963,14 +4963,14 @@ .. note:: - log -p/--patch may generate unexpected diff output for merge + :hg:`log --patch` may generate unexpected diff output for merge changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear in files:. .. note:: - for performance reasons, log FILE may omit duplicate changes + For performance reasons, :hg:`log FILE` may omit duplicate changes made on branches and will not show removals or mode changes. To see all such changes, use the --removed switch. @@ -6228,7 +6228,7 @@ .. note:: - status may appear to disagree with diff if permissions have + :hg:`status` may appear to disagree with diff if permissions have changed or a merge has occurred. The standard diff format does not report permission changes and diff only reports changes relative to one merge parent.
--- a/tests/test-help.t +++ b/tests/test-help.t @@ -498,9 +498,9 @@ Differences between files are shown using the unified diff format. Note: - 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. + "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. When two revision arguments are given, then changes are shown between those revisions. If only one revision is specified then that revision is @@ -558,10 +558,10 @@ explicitly requested with -u/--unknown or -i/--ignored. Note: - status may appear to disagree with diff if permissions have changed or - a merge has occurred. The standard diff format does not report - permission changes and diff only reports changes relative to one merge - parent. + "hg status" may appear to disagree with diff if permissions have + changed or a merge has occurred. The standard diff format does not + report permission changes and diff only reports changes relative to one + merge parent. If one revision is given, it is used as the base revision. If two revisions are given, the differences between them are shown. The --change