diff -r 2280461343e5 -r 1627153804dc tests/test-wireproto.t
--- a/tests/test-wireproto.t	Tue Jul 25 03:41:15 2017 +0200
+++ b/tests/test-wireproto.t	Tue Jul 25 03:59:22 2017 +0200
@@ -92,7 +92,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   obsmarker-exchange: 151 bytes received
   2 new obsolescence markers
-  (run 'hg heads' to see heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes
@@ -147,7 +147,7 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   obsmarker-exchange: 227 bytes received
   1 new obsolescence markers
-  (run 'hg heads' to see heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
 test discovery avoid exchanging known markers