diff -r 26b84128c54d -r cb15835456cb tests/test-merge7.t
--- a/tests/test-merge7.t	Thu May 15 02:14:59 2014 +0200
+++ b/tests/test-merge7.t	Tue Apr 22 02:10:25 2014 +0200
@@ -84,8 +84,8 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
+   preserving test.txt for resolve of test.txt
    test.txt: versions differ -> m
-    preserving test.txt for resolve of test.txt
   updating: test.txt 1/1 files (100.00%)
   picked tool 'internal:merge' for test.txt (binary False symlink False)
   merging test.txt