Test failure in stable: test-convert-bzr-merges

[Greg Ward]

I've got an up-to-date clone of http://selenic.com/repo/hg-stable, and
test-convert-bzr-merges is failing:

ERROR: test-convert-bzr-merges output changed
--- Expected output
+++ Test output
@@ -1,19 +1,15 @@
 % test multiple merges at once
+bzr: ERROR: Working tree
"/tmp/hgtests.xZ6qBd/test-convert-bzr-merges/test-multimerge/source/"
has uncommitted changes.
 initializing destination source-hg repository
 scanning source...
 sorting...
 converting...
-4 Initial add
-3 Added branch1 file
-2 Added parent file
-1 Added brach2 file
+3 Initial add
+2 Added branch1 file
+1 Added parent file
 0 Merged branches
-o    5 "(octopus merge fixup)" files:
+o    3 "Merged branches" files:
 |\
-| o    4 "Merged branches" files: file-branch2
-| |\
-o---+  3 "Added brach2 file" files: file-branch2
- / /
 | o  2 "Added parent file" files: file-parent
 | |
 o |  1 "Added branch1 file" files: file file-branch1
@@ -23,5 +19,4 @@
 % manifest of tip
 644   file
 644   file-branch1
-644   file-branch2
 644   file-parent

No time to dig further right now.  I'll try to do a bisect later
today, mainly because it makes me sound like a grizzled DVCS veteran
to say cool things like "do a bisect".  ;-)

Greg