diff tests/test-touch.t @ 4673:3ef4980353af mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 05 Jun 2019 17:45:45 +0200
parents d70db7e455dc 30a544904238
children 79bc0f1a832e c6fc1000af1e
line wrap: on
line diff
--- a/tests/test-touch.t	Wed Jun 05 17:42:50 2019 +0200
+++ b/tests/test-touch.t	Wed Jun 05 17:45:45 2019 +0200
@@ -32,9 +32,9 @@
   $ hg add b
   $ hg commit -m ab --amend
   $ hg up --hidden 1
+  updating to a hidden changeset [0-9a-f]{12} (re)
+  (hidden revision '*' was rewritten as: *) (glob)
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  updated to hidden changeset * (glob)
-  (hidden revision '*' was rewritten as: *) (glob)
   working directory parent is obsolete! (*) (glob)
   (use 'hg evolve' to update to its successor: *) (glob)
   $ hg log -G