[PATCH] hg: say 'hg update' instead of 'hg up' in merge status message

[Martin Geisler]

Stuart W Marks <smarks at smarks.org> writes:

> # HG changeset patch
> # User Stuart W Marks <smarks at smarks.org>
> # Date 1253252378 25200
> # Node ID abed2d46ed455e223e720f6fe7a54f9e62e89bc5
> # Parent  c564dbb2a6d5394c995c1ae93943a16253e7b1e5
> hg: say 'hg update' instead of 'hg up' in merge status message

Pushed to crew as revision b2310903c462, thanks!

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20090919/2b985c77/attachment.pgp