merge with crew stable
authorMatt Mackall <mpm@selenic.com>
Wed, 06 Apr 2011 15:13:49 -0500
branchstable
changeset 13901 d3890ead75be
parent 13900 a3403d5b0af3 (current diff)
parent 13882 0a0988bd4818 (diff)
child 13902 fab10e7cacd6
child 13904 5065e120636d
merge with crew
--- a/mercurial/help/dates.txt	Wed Apr 06 15:10:47 2011 -0500
+++ b/mercurial/help/dates.txt	Wed Apr 06 15:13:49 2011 -0500
@@ -23,10 +23,10 @@
 
 - ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)
 
-This is the internal representation format for dates. unixtime is the
-number of seconds since the epoch (1970-01-01 00:00 UTC). offset is
-the offset of the local timezone, in seconds west of UTC (negative if
-the timezone is east of UTC).
+This is the internal representation format for dates. The first number
+is the number of seconds since the epoch (1970-01-01 00:00 UTC). The
+second is the offset of the local timezone, in seconds west of UTC
+(negative if the timezone is east of UTC).
 
 The log command also accepts date ranges: