--- a/tests/test-status-color.t	Sun Oct 11 20:12:12 2015 -0700
+++ b/tests/test-status-color.t	Sun Oct 11 21:56:39 2015 -0700
@@ -325,8 +325,8 @@
   created new head
   $ hg merge
   merging a
+  merging b
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
-  merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 2 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon