branching: merge with stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 08 Feb 2019 09:29:54 +0100
changeset 4396 83d45ded5af8
parent 4394 c6d1b0a6babe (current diff)
parent 4395 610999a1bae1 (diff)
child 4398 5bca2c579b05
branching: merge with stable
tests/test-prev-next.t
--- a/tests/test-prev-next.t	Wed Nov 21 12:00:46 2018 +0000
+++ b/tests/test-prev-next.t	Fri Feb 08 09:29:54 2019 +0100
@@ -339,7 +339,7 @@
   $ sleep 1
   $ hg prev
   waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
-  got lock after [4-6] seconds (re)
+  got lock after (\d+) seconds (re)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [0] one
   $ wait