--- a/tests/test-obsolete.t Fri Aug 08 17:46:20 2014 -0700
+++ b/tests/test-obsolete.t Fri Aug 08 17:49:22 2014 -0700
@@ -274,7 +274,7 @@
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
pull obsolescence markers
- 1 markers added
+ 1 obsolescence markers added
(run 'hg heads' to see heads, 'hg merge' to merge)
$ qlog -R ../other-new
6
@@ -365,7 +365,7 @@
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
pull obsolescence markers
- 1 markers added
+ 1 obsolescence markers added
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q 7 # to check rollback update behavior