equal
deleted
inserted
replaced
1 updating to branch default |
|
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 updating to branch default |
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 updating to branch default |
|
6 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 pulling from ../B1 |
|
8 searching for changes |
|
9 adding changesets |
|
10 adding manifests |
|
11 adding file changes |
|
12 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
13 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 (branch merge, don't forget to commit) |
|
16 bar should remain deleted. |
|
17 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
|
18 pulling from ../A2 |
|
19 searching for changes |
|
20 adding changesets |
|
21 adding manifests |
|
22 adding file changes |
|
23 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
24 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
26 (branch merge, don't forget to commit) |
|
27 bar should remain deleted. |
|
28 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo |
|