tests/test-double-merge.t
changeset 25125 bd625cd4e5e7
parent 21391 cb15835456cb
child 26517 d8463a743d7d
--- a/tests/test-double-merge.t	Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-double-merge.t	Sat May 09 23:40:40 2015 -0700
@@ -38,13 +38,11 @@
    preserving foo for resolve of bar
    preserving foo for resolve of foo
    bar: remote copied from foo -> m
-  updating: bar 1/2 files (50.00%)
   picked tool 'internal:merge' for bar (binary False symlink False)
   merging foo and bar to bar
   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful
    foo: versions differ -> m
-  updating: foo 2/2 files (100.00%)
   picked tool 'internal:merge' for foo (binary False symlink False)
   merging foo
   my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc