Mercurial > hg-stable
changeset 30767:bbb5cc55ab8b
help: use a single paragraph to describe full and abbreviated nodeids
The texts describing 40-digit strings and the abbreviated form are
closely related, so make it a single paragraph.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 11 Jan 2017 11:28:54 -0800 |
parents | d7bf7d2bd5ab |
children | 43839a24fd59 |
files | mercurial/help/revisions.txt tests/test-help.t |
diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/revisions.txt Tue Jan 10 23:37:08 2017 -0800 +++ b/mercurial/help/revisions.txt Wed Jan 11 11:28:54 2017 -0800 @@ -4,9 +4,7 @@ treated as sequential offsets from the tip, with -1 denoting the tip, -2 denoting the revision prior to the tip, and so forth. -A 40-digit hexadecimal string is treated as a unique revision -identifier. - +A 40-digit hexadecimal string is treated as a unique revision identifier. A hexadecimal string less than 40 characters long is treated as a unique revision identifier and is referred to as a short-form identifier. A short-form identifier is only valid if it is the prefix
--- a/tests/test-help.t Tue Jan 10 23:37:08 2017 -0800 +++ b/tests/test-help.t Wed Jan 11 11:28:54 2017 -0800 @@ -1165,7 +1165,6 @@ denoting the revision prior to the tip, and so forth. A 40-digit hexadecimal string is treated as a unique revision identifier. - A hexadecimal string less than 40 characters long is treated as a unique revision identifier and is referred to as a short-form identifier. A short-form identifier is only valid if it is the prefix of exactly one @@ -2781,10 +2780,7 @@ -2 denoting the revision prior to the tip, and so forth. </p> <p> - A 40-digit hexadecimal string is treated as a unique revision - identifier. - </p> - <p> + A 40-digit hexadecimal string is treated as a unique revision identifier. A hexadecimal string less than 40 characters long is treated as a unique revision identifier and is referred to as a short-form identifier. A short-form identifier is only valid if it is the prefix