--- a/tests/test-merge-criss-cross.t	Fri Apr 18 13:33:20 2014 +0200
+++ b/tests/test-merge-criss-cross.t	Mon Apr 21 20:24:54 2014 +0200
@@ -330,9 +330,9 @@
   resolving manifests
   
   auction for merging merge bids
-   x: multiple merge bids:
-    x: m
-    x: m
+   x: multiple bids for merge action:
+    versions differ -> m
+    versions differ -> m
    x: ambiguous merge - picked m action
   end of auction