diff tests/test-touch.t @ 5834:c2484b0217ee mercurial-4.6

test-compat: merge mercurial-4.7 into mercurial-4.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 14:49:22 +0800
parents 88f9bbba392d a1dad44fe3da
children ee54e02d3ea0
line wrap: on
line diff
--- a/tests/test-touch.t	Thu Mar 11 14:48:12 2021 +0800
+++ b/tests/test-touch.t	Thu Mar 11 14:49:22 2021 +0800
@@ -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