merge with stable
authorMartin Geisler <mg@aragost.com>
Tue, 05 Apr 2011 11:09:08 +0200
changeset 13887 06803dc5fc19
parent 13886 fe48c57390f2 (current diff)
parent 13882 0a0988bd4818 (diff)
child 13888 9e5407a67dea
merge with stable
mercurial/help/dates.txt
--- a/mercurial/help/dates.txt	Tue Apr 05 10:01:39 2011 +0200
+++ b/mercurial/help/dates.txt	Tue Apr 05 11:09:08 2011 +0200
@@ -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: