Mercurial > hg
view mercurial/help/dates.txt @ 21519:25d5a9ecbb85
merge: add conflict marker formatter (BC)
Adds a conflict marker formatter that can produce custom conflict marker
descriptions. It can be set via ui.mergemarkertemplate. The old behavior
can be used still by setting ui.mergemarkers=basic.
The default format is similar to:
{node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"
And renders as:
contextblahblah
<<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
line from my changes
=======
line from the other changes
>>>>>>> other: a3e55d7f4d38 master - sid0: "This is a commit to master th...
morecontextblahblah
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 08 May 2014 16:50:22 -0700 |
parents | 7bec3f697d76 |
children |
line wrap: on
line source
Some commands allow the user to specify a date, e.g.: - backout, commit, import, tag: Specify the commit date. - log, revert, update: Select revision(s) by date. Many date formats are valid. Here are some examples: - ``Wed Dec 6 13:18:29 2006`` (local timezone assumed) - ``Dec 6 13:18 -0600`` (year assumed, time offset provided) - ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000) - ``Dec 6`` (midnight) - ``13:18`` (today assumed) - ``3:39`` (3:39AM assumed) - ``3:39pm`` (15:39) - ``2006-12-06 13:18:29`` (ISO 8601 format) - ``2006-12-6 13:18`` - ``2006-12-6`` - ``12-6`` - ``12/6`` - ``12/6/6`` (Dec 6 2006) - ``today`` (midnight) - ``yesterday`` (midnight) - ``now`` - right now Lastly, there is Mercurial's internal format: - ``1165411109 0`` (Wed Dec 6 13:18:29 2006 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: - ``<DATE`` - at or before a given date/time - ``>DATE`` - on or after a given date/time - ``DATE to DATE`` - a date range, inclusive - ``-DAYS`` - within a given number of days of today