Merge with crew-stable

test-parse-date: test 12-hours time formats (issue1804)

util: Fix date format for 12-hour time.

test-command-template: Don't diff files with same content Solaris diff will report "No differences encountered" on stdout

Merge with crew-stable

hgrc.5: document %unset directive

merge with crew-stable

dirstate.write: don't ignore stat data if mtime is in the future (issue1790) This change narrows the race guard that was introduced by af3f26b6bba4 ("dirstate: ignore stat data for files that were updated too recently") to not discard the _map entry's stat data if the mtime is in the future. Without this change, status locks files having odd mtimes in the future into the 'unset' state, causing needless file compares later (admittedly harmless), but also inflicting highly irritating sticky effects on tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).

Merge with crew-stable

hgrc.5: document %include directive

mq: don't mention qtop in module doc string (qtop was removed in b8dc3eba4f9d)

color: no need for itertools, zip() is good enough