diff mercurial/demandimport.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 ffeaf5ba25d8
children ecd0a5c8bbe5
line wrap: on
line diff