diff tests/test-touch.t @ 4784:ecf0f3bc7468 mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 14:43:17 +0200
parents c6fc1000af1e 076b6813a7ea
children 1752a2e7a226
line wrap: on
line diff
--- a/tests/test-touch.t	Mon Jul 29 14:43:15 2019 +0200
+++ b/tests/test-touch.t	Mon Jul 29 14:43:17 2019 +0200
@@ -34,9 +34,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