changeset 38261 | 1e9c357d3ddf |
parent 38204 | eb9835014d20 |
child 38262 | d0abd7949ea3 |
--- a/tests/test-merge6.t Sun Apr 29 00:29:40 2018 -0400 +++ b/tests/test-merge6.t Tue Jun 05 01:49:52 2018 +0200 @@ -42,7 +42,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets b90e70beeb58 - 1 changesets became public + 1 local changesets became public (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved