diff mercurial/filemerge.py @ 19287:8b04e1344111

util: add an optional timestamp parameter to makedate This will be used by the upcoming shelve extension.
author Bryan O'Sullivan <bryano@fb.com>
date Mon, 03 Jun 2013 17:20:45 -0700
parents c58b6ab4c26f
children 89b2336e5ccf
line wrap: on
line diff