branch | mercurial-4.1 |
changeset 2466 | e5e502407ab0 |
parent 2431 | 0405bbda7402 |
child 2799 | 1627153804dc |
--- a/tests/test-wireproto-bundle1.t Mon May 22 12:00:57 2017 +0200 +++ b/tests/test-wireproto-bundle1.t Mon May 22 15:28:36 2017 +0200 @@ -87,7 +87,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) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes