--- a/tests/test-merge7.t	Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-merge7.t	Sat May 09 23:40:40 2015 -0700
@@ -86,7 +86,6 @@
    ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
    preserving test.txt for resolve of test.txt
    test.txt: versions differ -> m
-  updating: test.txt 1/1 files (100.00%)
   picked tool 'internal:merge' for test.txt (binary False symlink False)
   merging test.txt
   my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118