Mercurial Mercurial > hg / 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-merge5.t
changeset 12681 bc13e17067d9
parent 12316 4134686b83e1
child 14485 610873cf064a 
--- a/tests/test-merge5.t	Sat Oct 09 17:58:48 2010 -0500
+++ b/tests/test-merge5.t	Sat Oct 09 17:02:28 2010 -0500
@@ -14,7 +14,7 @@
   $ hg update 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg update
-  abort: crosses branches (use 'hg merge' or use 'hg update -c')
+  abort: crosses branches (merge branches or use --check to force update)
   [255]
   $ hg update -c
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -27,7 +27,7 @@
 Should abort:
 
   $ hg update -y 1
-  abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
+  abort: crosses branches (merge branches or use --clean to discard changes)
   [255]
   $ mv c a
Mercurial