# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1254422559 -7200
# Node ID 3bfb3411f6f21aa4bb79fa08d049cbc57623515e
# Parent  c986858682e93ee094e68b3ab5053bda0e4fa575# Parent  c01143cef2c78b3a25724d3cbba8fe08d8e6d716
Merge with stable

diff -r c986858682e9 -r 3bfb3411f6f2 tests/test-keyword.out
--- a/tests/test-keyword.out	Sat Sep 19 12:04:38 2009 +0200
+++ b/tests/test-keyword.out	Thu Oct 01 20:42:39 2009 +0200
@@ -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