Mercurial > evolve
diff tests/test-evolve-serveronly-bundle2.t @ 3109:3024ae293732 mercurial-4.1
test-compat: merge with mercurial-4.2 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 18:41:05 +0200 |
| parents | 00e4d31b8cdb 9c9c8c1eeb93 |
| children | 78eb1c1d987b |
line wrap: on
line diff
--- a/tests/test-evolve-serveronly-bundle2.t Fri Oct 20 18:34:22 2017 +0200 +++ b/tests/test-evolve-serveronly-bundle2.t Fri Oct 20 18:41:05 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/