diff tests/test-touch.t @ 3923:257481642686 mercurial-4.6

test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Aug 2018 01:57:13 +0200
parents f7afd3a158e3
children d00f0c369bc7 d70db7e455dc
line wrap: on
line diff
--- a/tests/test-touch.t	Thu Aug 02 02:15:48 2018 +0200
+++ b/tests/test-touch.t	Thu Aug 02 01:57:13 2018 +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