--- a/tests/test-merge-criss-cross.t	Sat May 17 00:47:42 2014 -0700
+++ b/tests/test-merge-criss-cross.t	Fri May 02 01:09:14 2014 +0200
@@ -196,8 +196,8 @@
    f2: picking 'get' action
   end of auction
   
+   f2: remote is newer -> g
    f1: keep -> k
-   f2: remote is newer -> g
   getting f2
   updating: f2 1/1 files (100.00%)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved