--- 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