changeset 34661 | eb586ed5d8ce |
parent 16913 | f2719b387380 |
child 41510 | faa49a5914bb |
--- a/tests/test-merge10.t Fri Oct 13 21:36:10 2017 +0900 +++ b/tests/test-merge10.t Thu Oct 12 09:39:50 2017 +0200 @@ -33,6 +33,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) + new changesets cc7000b01af9 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -C 2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved