diff -r d4ee0274a8ef -r 0405bbda7402 tests/test-evolve-serveronly-bundle2.t
--- a/tests/test-evolve-serveronly-bundle2.t	Thu May 18 22:26:29 2017 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t	Thu May 18 23:12:52 2017 +0200
@@ -127,7 +127,7 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
-  (run 'hg heads' to see heads)
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   $ cat ../errors.log
   $ hg -R ../other pull
   pulling from http://localhost:$HGPORT/