facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

commands: the first word of each note should be capital or hg

Browse Source
This commit is contained in:
timeless 2015-12-22 02:24:16 +00:00
parent 054a9bb83f
commit a433b637d1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/commands.py
View File

@ -542,7 +542,7 @@ def backout(ui, repo, node=None, rev=None, commit=False, **opts):
.. 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 @@ def diff(ui, repo, *pats, **opts):
.. 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 @@ def export(ui, repo, *changesets, **opts):
.. 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 @@ def log(ui, repo, *pats, **opts):
.. 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 @@ def status(ui, repo, *pats, **opts):
.. 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.

14
tests/test-help.t
View File

@ -498,9 +498,9 @@ Test command without options
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 @@ Test command without options
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