--- a/tests/test-bookmarks-pushpull.t Tue Sep 20 23:47:02 2016 +0000
+++ b/tests/test-bookmarks-pushpull.t Tue Sep 20 23:47:30 2016 +0000
@@ -427,7 +427,7 @@
pushing to http://localhost:$HGPORT2/
searching for changes
abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
- (merge or see "hg help push" for details about pushing new heads)
+ (merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg -R ../a book
@ 1:0d2164f0ce0d
@@ -443,7 +443,7 @@
pushing to http://localhost:$HGPORT2/
searching for changes
abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
- (merge or see "hg help push" for details about pushing new heads)
+ (merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg -R ../a book
@ 1:0d2164f0ce0d
@@ -733,7 +733,7 @@
searching for changes
remote has heads on branch 'default' that are not known locally: a2a606d9ff1b
abort: push creates new remote head 54694f811df9 with bookmark 'X'!
- (pull and merge or see "hg help push" for details about pushing new heads)
+ (pull and merge or see 'hg help push' for details about pushing new heads)
[255]
$ cd ../addmarks