##// END OF EJS Templates
commands: the first word of each note should be capital or `hg`
timeless -
r27476:9ebc0215 default
parent child Browse files
Show More
@@ -542,7 +542,7 def backout(ui, repo, node=None, rev=Non
542
542
543 .. note::
543 .. note::
544
544
545 backout cannot be used to fix either an unwanted or
545 :hg:`backout` cannot be used to fix either an unwanted or
546 incorrect merge.
546 incorrect merge.
547
547
548 .. container:: verbose
548 .. container:: verbose
@@ -3523,7 +3523,7 def diff(ui, repo, *pats, **opts):
3523
3523
3524 .. note::
3524 .. note::
3525
3525
3526 diff may generate unexpected results for merges, as it will
3526 :hg:`diff` may generate unexpected results for merges, as it will
3527 default to comparing against the working directory's first
3527 default to comparing against the working directory's first
3528 parent changeset if no revisions are specified.
3528 parent changeset if no revisions are specified.
3529
3529
@@ -3614,7 +3614,7 def export(ui, repo, *changesets, **opts
3614
3614
3615 .. note::
3615 .. note::
3616
3616
3617 export may generate unexpected diff output for merge
3617 :hg:`export` may generate unexpected diff output for merge
3618 changesets, as it will compare the merge changeset against its
3618 changesets, as it will compare the merge changeset against its
3619 first parent only.
3619 first parent only.
3620
3620
@@ -4963,14 +4963,14 def log(ui, repo, *pats, **opts):
4963
4963
4964 .. note::
4964 .. note::
4965
4965
4966 log -p/--patch may generate unexpected diff output for merge
4966 :hg:`log --patch` may generate unexpected diff output for merge
4967 changesets, as it will only compare the merge changeset against
4967 changesets, as it will only compare the merge changeset against
4968 its first parent. Also, only files different from BOTH parents
4968 its first parent. Also, only files different from BOTH parents
4969 will appear in files:.
4969 will appear in files:.
4970
4970
4971 .. note::
4971 .. note::
4972
4972
4973 for performance reasons, log FILE may omit duplicate changes
4973 For performance reasons, :hg:`log FILE` may omit duplicate changes
4974 made on branches and will not show removals or mode changes. To
4974 made on branches and will not show removals or mode changes. To
4975 see all such changes, use the --removed switch.
4975 see all such changes, use the --removed switch.
4976
4976
@@ -6228,7 +6228,7 def status(ui, repo, *pats, **opts):
6228
6228
6229 .. note::
6229 .. note::
6230
6230
6231 status may appear to disagree with diff if permissions have
6231 :hg:`status` may appear to disagree with diff if permissions have
6232 changed or a merge has occurred. The standard diff format does
6232 changed or a merge has occurred. The standard diff format does
6233 not report permission changes and diff only reports changes
6233 not report permission changes and diff only reports changes
6234 relative to one merge parent.
6234 relative to one merge parent.
@@ -498,9 +498,9 Test command without options
498 Differences between files are shown using the unified diff format.
498 Differences between files are shown using the unified diff format.
499
499
500 Note:
500 Note:
501 diff may generate unexpected results for merges, as it will default to
501 "hg diff" may generate unexpected results for merges, as it will
502 comparing against the working directory's first parent changeset if no
502 default to comparing against the working directory's first parent
503 revisions are specified.
503 changeset if no revisions are specified.
504
504
505 When two revision arguments are given, then changes are shown between
505 When two revision arguments are given, then changes are shown between
506 those revisions. If only one revision is specified then that revision is
506 those revisions. If only one revision is specified then that revision is
@@ -558,10 +558,10 Test command without options
558 explicitly requested with -u/--unknown or -i/--ignored.
558 explicitly requested with -u/--unknown or -i/--ignored.
559
559
560 Note:
560 Note:
561 status may appear to disagree with diff if permissions have changed or
561 "hg status" may appear to disagree with diff if permissions have
562 a merge has occurred. The standard diff format does not report
562 changed or a merge has occurred. The standard diff format does not
563 permission changes and diff only reports changes relative to one merge
563 report permission changes and diff only reports changes relative to one
564 parent.
564 merge parent.
565
565
566 If one revision is given, it is used as the base revision. If two
566 If one revision is given, it is used as the base revision. If two
567 revisions are given, the differences between them are shown. The --change
567 revisions are given, the differences between them are shown. The --change
General Comments 0
You need to be logged in to leave comments. Login now