tests/test-wireproto.t
branchmercurial-4.1
changeset 2466 e5e502407ab0
parent 2431 0405bbda7402
child 2531 d3d686f05458
--- a/tests/test-wireproto.t	Mon May 22 12:00:57 2017 +0200
+++ b/tests/test-wireproto.t	Mon May 22 15:28:36 2017 +0200
@@ -92,7 +92,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   obsmarker-exchange: 139 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,6 +147,6 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   obsmarker-exchange: 208 bytes received
   1 new obsolescence markers
-  (run 'hg heads' to see heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ cd ..