diff -r 7955127efbcb -r 36383507a6f8 tests/test-resolve.t
--- a/tests/test-resolve.t	Sun Oct 11 23:56:44 2015 -0700
+++ b/tests/test-resolve.t	Sun Oct 11 23:58:07 2015 -0700
@@ -135,8 +135,8 @@
 resolve --all should re-merge all unresolved files
   $ hg resolve --all
   merging file1
+  merging file2
   warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
-  merging file2
   warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ cat file1.orig