Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-subrepo.t
changeset 12314 f2daa6ab514a
parent 12127 36a65283c3af
child 12316 4134686b83e1 
--- a/tests/test-subrepo.t	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-subrepo.t	Sun Sep 12 18:05:53 2010 -0500
@@ -217,7 +217,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 update -C' 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)
mercurial