# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1231177520 -3600
# Node ID 7c4765d51c3ce76b137f056c7b7793a83491126e
# Parent  d702a702259fb9b9cc9e90ed703180765a2698e5
tests: shrink wait interval for test-convert-bzr-merges

diff -r d702a702259f -r 7c4765d51c3c tests/test-convert-bzr-merges
--- a/tests/test-convert-bzr-merges	Mon Jan 05 14:37:46 2009 +0100
+++ b/tests/test-convert-bzr-merges	Mon Jan 05 18:45:20 2009 +0100
@@ -18,7 +18,7 @@
 bzr add -q file-branch1
 bzr commit -q -m 'Added branch1 file'
 cd ../source
-sleep 3
+sleep 1
 echo content > file-parent
 bzr add -q file-parent
 bzr commit -q -m 'Added parent file'
@@ -28,7 +28,7 @@
 echo somecontent > file-branch2
 bzr add -q file-branch2
 bzr commit -q -m 'Added brach2 file'
-sleep 3
+sleep 1
 cd ../source
 bzr merge -q ../source-branch1
 bzr merge -q --force ../source-branch2