--- a/tests/test-tutorial.t Fri Aug 08 17:46:20 2014 -0700
+++ b/tests/test-tutorial.t Fri Aug 08 17:49:22 2014 -0700
@@ -522,7 +522,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
pull obsolescence markers
- 1 markers added
+ 1 obsolescence markers added
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (public): bathroom stuff
@@ -580,7 +580,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
pull obsolescence markers
- 1 markers added
+ 1 obsolescence markers added
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (draft): bathroom stuff
@@ -641,7 +641,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
pull obsolescence markers
- 0 markers added
+ 0 obsolescence markers added
(run 'hg heads' to see heads, 'hg merge' to merge)
1 new unstable changesets
@@ -740,7 +740,7 @@
searching for changes
no changes found
pull obsolescence markers
- 0 markers added
+ 0 obsolescence markers added
working directory parent is obsolete!
now let's see where we are, and update to the successor
@@ -771,7 +771,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
pull obsolescence markers
- 0 markers added
+ 0 obsolescence markers added
(run 'hg update' to get a working copy)
$ hg log -G
o 99f039c5ec9e (draft): SPAM SPAM SPAM