Mercurial > hg

diff tests/test-subrepo.out @ 9468:b2310903c462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7b19cda0fa10
children a3d73b3e1f8a
line wrap: on
line diff
--- 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