changeset 38171 | eb9835014d20 |
parent 34661 | eb586ed5d8ce |
child 38249 | 1e9c357d3ddf |
--- a/tests/test-merge6.t Mon May 28 01:36:34 2018 -0400 +++ b/tests/test-merge6.t Thu May 24 12:19:50 2018 +0200 @@ -42,6 +42,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets b90e70beeb58 + 1 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