--- a/tests/test-bookmarks-merge.t Tue Oct 08 10:40:36 2019 -0700
+++ b/tests/test-bookmarks-merge.t Tue Oct 08 19:35:30 2019 -0700
@@ -58,7 +58,7 @@
(leaving bookmark e)
$ hg merge
abort: heads are bookmarked - please merge with an explicit rev
- (run 'hg heads' to see all heads)
+ (run 'hg heads' to see all heads, specify rev with -r)
[255]
# our revision is bookmarked
@@ -68,7 +68,7 @@
(activating bookmark e)
$ hg merge
abort: no matching bookmark to merge - please merge with an explicit rev or bookmark
- (run 'hg heads' to see all heads)
+ (run 'hg heads' to see all heads, specify rev with -r)
[255]
# merge bookmark heads
@@ -148,5 +148,5 @@
$ hg merge
abort: heads are bookmarked - please merge with an explicit rev
- (run 'hg heads' to see all heads)
+ (run 'hg heads' to see all heads, specify rev with -r)
[255]