# HG changeset patch
# User Stuart W Marks <smarks@smarks.org>
# Date 1253252378 25200
# Node ID c01143cef2c78b3a25724d3cbba8fe08d8e6d716
# Parent  c2b1a05b35e1c4f37e93737c2e77004e4d9456c8
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.

[ original upstream message ]

diff -r c2b1a05b35e1 -r c01143cef2c7 tests/test-keyword.out
--- a/tests/test-keyword.out	Sat Sep 19 01:15:38 2009 +0200
+++ b/tests/test-keyword.out	Thu Sep 17 22:39:38 2009 -0700
@@ -396,7 +396,7 @@
 warning: conflicts during merge.
 merging m failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 % keyword stays outside conflict zone
 $Id$
 <<<<<<< local