tests/test-rebase-pull.t
changeset 28189 fac3a24be50e
parent 28118 0e3835c7e1cf
child 28627 d7af9b4ae7dd
--- a/tests/test-rebase-pull.t	Wed Feb 17 20:31:34 2016 +0000
+++ b/tests/test-rebase-pull.t	Sun Feb 14 13:25:59 2016 +0000
@@ -85,7 +85,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  nothing to rebase - working directory parent is already an ancestor of destination 77ae9631bcca
+  nothing to rebase - updating instead
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updating bookmark norebase
 
@@ -285,7 +285,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  nothing to rebase - working directory parent is already an ancestor of destination 65bc164c1d9b
+  nothing to rebase - updating instead
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   1 other heads for branch "default"
   $ hg tglog