Mercurial > hg-stable
changeset 14016:bd738875943a
merge with stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Tue, 26 Apr 2011 13:13:35 +0200 |
parents | 39920ce75842 (current diff) 42d5165975ad (diff) |
children | 19a7b48446e3 |
files | mercurial/commands.py tests/test-qrecord.t |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Apr 26 12:56:56 2011 +0200 +++ b/mercurial/commands.py Tue Apr 26 13:13:35 2011 +0200 @@ -4295,7 +4295,7 @@ commitopts2 = [ ('d', 'date', '', - _('record datecode as commit date'), _('DATE')), + _('record the specified date as commit date'), _('DATE')), ('u', 'user', '', _('record the specified user as committer'), _('USER')), ]
--- a/tests/test-qrecord.t Tue Apr 26 12:56:56 2011 +0200 +++ b/tests/test-qrecord.t Tue Apr 26 13:13:35 2011 +0200 @@ -62,7 +62,7 @@ -X --exclude PATTERN [+] exclude names matching the given patterns -m --message TEXT use text as commit message -l --logfile FILE read commit message from file - -d --date DATE record datecode as commit date + -d --date DATE record the specified date as commit date -u --user USER record the specified user as committer [+] marked option can be specified multiple times