tests/test-divergent.t
changeset 3739 0bfc4fe3baf8
parent 3417 d3a17c67f85c
child 3740 07e246deb612
--- a/tests/test-divergent.t	Sun Apr 29 19:04:18 2018 +0530
+++ b/tests/test-divergent.t	Sun Apr 29 19:11:29 2018 +0530
@@ -58,7 +58,6 @@
   with: [3] add bdivergent2
   base: [1] add _b
   updating to "local" conflict
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at c26f1d3baed2
   $ hg log -G
@@ -104,7 +103,6 @@
   base: [5] add _c
   updating to "local" conflict
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   nothing changed
   working directory is now at 26c7705fee96