branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 08 Feb 2019 17:52:49 +0100
changeset 4398 5bca2c579b05
parent 4396 83d45ded5af8 (current diff)
parent 4397 d2c1e6d61658 (diff)
child 4400 9a6cebfb596b
child 4401 4baf81dd2193
branching: merge with stable
tests/test-prev-next.t
--- a/tests/test-prev-next.t	Fri Feb 08 09:29:54 2019 +0100
+++ b/tests/test-prev-next.t	Fri Feb 08 17:52:49 2019 +0100
@@ -349,7 +349,7 @@
   $ hg next --evolve
   waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
   1 new orphan changesets
-  got lock after [4-6] seconds (re)
+  got lock after (\d+) seconds (re)
   move:[2] two
   atop:[3] one
   working directory now at a7d885c75614