equal
deleted
inserted
replaced
51 searching for changes |
51 searching for changes |
52 adding changesets |
52 adding changesets |
53 adding manifests |
53 adding manifests |
54 adding file changes |
54 adding file changes |
55 added 1 changesets with 2 changes to 2 files (+1 heads) |
55 added 1 changesets with 2 changes to 2 files (+1 heads) |
|
56 new changesets bdd988058d16 |
56 (run 'hg heads' to see heads, 'hg merge' to merge) |
57 (run 'hg heads' to see heads, 'hg merge' to merge) |
57 |
58 |
58 $ hg merge -v |
59 $ hg merge -v |
59 resolving manifests |
60 resolving manifests |
60 getting bar |
61 getting bar |