tests/test-filebranch.t

--- a/tests/test-filebranch.t	Fri Feb 18 03:34:47 2011 +0100
+++ b/tests/test-filebranch.t	Fri Feb 18 03:35:01 2011 +0100
@@ -55,10 +55,10 @@
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg merge -v
-  merging for foo
   resolving manifests
   getting bar
   merging foo
+  merging for foo
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)