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-pull-update.t
changeset 14485 610873cf064a
parent 12279 28e2e3804f2e
child 16913 f2719b387380 
--- a/tests/test-pull-update.t	Tue May 31 15:55:23 2011 -0500
+++ b/tests/test-pull-update.t	Tue May 31 11:52:22 2011 -0700
@@ -25,8 +25,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating, since new heads added
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  not updating: crosses branches (merge branches or update --check to force update)
 
   $ cd ../tt
 
@@ -39,8 +38,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating, since new heads added
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  not updating: crosses branches (merge branches or update --check to force update)
 
   $ HGMERGE=true hg merge
   merging foo
Mercurial