Rev 5655: Fix pqm failure. in http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/2.3-integration/

------------------------------------------------------------
revno: 5655
revision-id: v.ladeuil+lp at free.fr-20110705140457-9agcbfskn9b077bs
parent: v.ladeuil+lp at free.fr-20110705115454-hg9s5ip3sqm3uqek
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.3.4-dev
timestamp: Tue 2011-07-05 16:04:57 +0200
message:
  Fix pqm failure.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2011-07-05 11:54:54 +0000
+++ b/bzrlib/tests/test_conflicts.py	2011-07-05 14:04:57 +0000
@@ -1083,6 +1083,7 @@
 # Create an experimental branch with a new root-id
 $ cd ..
 $ bzr init experimental
+Created a standalone tree (format: 2a)
 $ cd experimental
 # merge debian even without a common ancestor
 $ bzr merge ../debian -r0..2
@@ -1097,6 +1098,7 @@
 # Create an ubuntu branch with yet another root-id
 $ cd ..
 $ bzr init ubuntu
+Created a standalone tree (format: 2a)
 $ cd ubuntu
 # Also merge debian
 $ bzr merge ../debian -r0..2