branch | mercurial-4.1 |
changeset 3109 | 3024ae293732 |
parent 3002 | 00e4d31b8cdb |
parent 3108 | 9c9c8c1eeb93 |
--- a/tests/test-wireproto-bundle1.t Fri Oct 20 18:34:22 2017 +0200 +++ b/tests/test-wireproto-bundle1.t Fri Oct 20 18:41:05 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