diff mercurial/merge.py @ 5357:c6adf2be6069

util: add default argument to strdate
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 02 Oct 2007 13:46:59 -0700
parents 90d9ec0dc69d
children 17ed9b9a0d03
line wrap: on
line diff