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-pull-update.t
changeset 19798 76df01e56e7f
parent 16913 f2719b387380
child 26968 216cc65cf227 
--- a/tests/test-pull-update.t	Mon Sep 23 19:02:32 2013 -0700
+++ b/tests/test-pull-update.t	Mon Sep 23 17:43:33 2013 -0700
@@ -25,7 +25,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating: crosses branches (merge branches or update --check to force update)
+  not updating: not a linear update
+  (merge or update --check to force update)
 
   $ cd ../tt
 
@@ -38,7 +39,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating: crosses branches (merge branches or update --check to force update)
+  not updating: not a linear update
+  (merge or update --check to force update)
 
   $ HGMERGE=true hg merge
   merging foo
mercurial