branch | mercurial-4.1 |
changeset 3593 | b92114f201c9 |
parent 3168 | 78eb1c1d987b |
--- a/tests/test-evolve-serveronly-bundle2.t Wed Mar 21 16:32:54 2018 +0100 +++ b/tests/test-evolve-serveronly-bundle2.t Wed Mar 21 16:35:18 2018 +0100 @@ -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/