Mercurial > evolve
diff tests/test-wireproto.t @ 3178:d1800f4983b5 mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 07 Nov 2017 13:05:39 +0100 |
| parents | a7050ab9d8c1 3024ae293732 |
| children | 0587b10d143a |
line wrap: on
line diff
--- a/tests/test-wireproto.t Tue Nov 07 13:05:38 2017 +0100 +++ b/tests/test-wireproto.t Tue Nov 07 13:05:39 2017 +0100 @@ -92,7 +92,7 @@ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 151 bytes received 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 @@ -147,7 +147,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) obsmarker-exchange: 227 bytes received 1 new obsolescence markers - (run 'hg heads' to see heads) + (run 'hg heads' to see heads, 'hg merge' to merge) test discovery avoid exchanging known markers