--- a/tests/test-subrepo.out Sat Sep 19 01:15:38 2009 +0200
+++ b/tests/test-subrepo.out Thu Sep 17 22:39:38 2009 -0700
@@ -87,7 +87,7 @@
warning: conflicts during merge.
merging t 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
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should conflict