tests/test-up-local-change.t
changeset 25125 bd625cd4e5e7
parent 24885 eea3977e6fca
child 26611 a5ff66e6d77a
--- a/tests/test-up-local-change.t	Fri May 15 11:52:39 2015 +0800
+++ b/tests/test-up-local-change.t	Sat May 09 23:40:40 2015 -0700
@@ -49,9 +49,7 @@
    preserving a for resolve of a
    b: remote created -> g
   getting b
-  updating: b 1/2 files (50.00%)
    a: versions differ -> m
-  updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
@@ -72,9 +70,7 @@
    preserving a for resolve of a
    b: other deleted -> r
   removing b
-  updating: b 1/2 files (50.00%)
    a: versions differ -> m
-  updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
@@ -103,9 +99,7 @@
    preserving a for resolve of a
    b: remote created -> g
   getting b
-  updating: b 1/2 files (50.00%)
    a: versions differ -> m
-  updating: a 2/2 files (100.00%)
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a