Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-wireproto.t
branchmercurial-4.1
changeset 3109 3024ae293732
parent 3002 00e4d31b8cdb
parent 3108 9c9c8c1eeb93
child 3178 d1800f4983b5 
--- a/tests/test-wireproto.t	Fri Oct 20 18:34:22 2017 +0200
+++ b/tests/test-wireproto.t	Fri Oct 20 18:41:05 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
evolve