diff contrib/tmplrewrite.py @ 9468:b2310903c462

hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change.
author Stuart W Marks <smarks@smarks.org>
date Thu, 17 Sep 2009 22:39:38 -0700
parents 94ef2c8ce683
children
line wrap: on
line diff