--- a/tests/test-586.out Sun Dec 30 17:36:49 2007 +0100
+++ b/tests/test-586.out Sun Dec 30 17:45:26 2007 +0100
@@ -10,4 +10,4 @@
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-C b
+= b