Mercurial > evolve
diff tests/test-evolve-serveronly-bundle2.t @ 2799:1627153804dc mercurial-4.1
test-compat: merge with mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 25 Jul 2017 03:59:22 +0200 |
| parents | 0405bbda7402 2280461343e5 |
| children | 00e4d31b8cdb |
line wrap: on
line diff
--- a/tests/test-evolve-serveronly-bundle2.t Tue Jul 25 03:41:15 2017 +0200 +++ b/tests/test-evolve-serveronly-bundle2.t Tue Jul 25 03:59:22 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/