tests/test-copy-move-merge.t
changeset 25125 bd625cd4e5e7
parent 21391 cb15835456cb
child 26013 38f92d12357c
--- a/tests/test-copy-move-merge.t	Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-copy-move-merge.t	Sat May 09 23:40:40 2015 -0700
@@ -35,13 +35,11 @@
    preserving a for resolve of c
   removing a
    b: remote moved from a -> m
-  updating: b 1/2 files (50.00%)
   picked tool 'internal:merge' for b (binary False symlink False)
   merging a and b to b
   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
    c: remote moved from a -> m
-  updating: c 2/2 files (100.00%)
   picked tool 'internal:merge' for c (binary False symlink False)
   merging a and c to c
   my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc