# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1303816415 -7200
# Node ID bd738875943a3295c9dec7b8191e93ceb0319c79
# Parent  39920ce75842d9e08a1c733e4c8d78d87c7d2493# Parent  42d5165975adf057b9a1015fdd025a278a096b68
merge with stable

diff -r 39920ce75842 -r bd738875943a mercurial/commands.py
--- 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')),
 ]
diff -r 39920ce75842 -r bd738875943a tests/test-qrecord.t
--- 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