diff mercurial/merge.py @ 13148:ab5fcc473fd1

progress: include time estimate as part of the default progress format
author Augie Fackler <durin42@gmail.com>
date Wed, 15 Dec 2010 10:22:54 -0600
parents 62c8f7691bc3
children 9e7e24052745 c19b9282d3a7
line wrap: on
line diff