branch | mercurial-4.1 |
changeset 3168 | 78eb1c1d987b |
parent 3109 | 3024ae293732 |
parent 3167 | f089741039e5 |
--- a/tests/test-evolve-serveronly-bundle2.t Wed Nov 01 23:58:27 2017 +0100 +++ b/tests/test-evolve-serveronly-bundle2.t Wed Nov 01 23:58:27 2017 +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/