equal
deleted
inserted
replaced
11 searching for changes |
11 searching for changes |
12 adding changesets |
12 adding changesets |
13 adding manifests |
13 adding manifests |
14 adding file changes |
14 adding file changes |
15 added 1 changesets with 2 changes to 2 files (+1 heads) |
15 added 1 changesets with 2 changes to 2 files (+1 heads) |
16 (run 'hg update' to get a working copy) |
16 (run 'hg heads' to see heads, 'hg merge' to merge) |
17 merging for foo |
17 merging for foo |
18 resolving manifests |
18 resolving manifests |
19 getting bar |
19 getting bar |
20 merging foo |
20 merging foo |
21 resolving foo |
21 resolving foo |