equal
deleted
inserted
replaced
34 adding changesets |
34 adding changesets |
35 adding manifests |
35 adding manifests |
36 adding file changes |
36 adding file changes |
37 added 1 changesets with 1 changes to 1 files (+1 heads) |
37 added 1 changesets with 1 changes to 1 files (+1 heads) |
38 new changesets d2ae7f538514 |
38 new changesets d2ae7f538514 |
39 1 local changesets became public |
39 1 local changesets published |
40 (run 'hg heads' to see heads, 'hg merge' to merge) |
40 (run 'hg heads' to see heads, 'hg merge' to merge) |
41 |
41 |
42 $ hg merge |
42 $ hg merge |
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
44 (branch merge, don't forget to commit) |
44 (branch merge, don't forget to commit) |