equal
deleted
inserted
replaced
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3 merge |
3 merge |
4 resolving manifests |
4 resolving manifests |
5 overwrite None branchmerge True partial False |
5 overwrite None branchmerge True partial False |
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
6 ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c |
7 b: remote created -> g |
7 a: remote moved -> c |
8 b2: remote created -> g |
8 b2: remote created -> g |
9 getting b |
9 resolving a |
|
10 my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c |
|
11 copying a to b |
|
12 removing a |
10 getting b2 |
13 getting b2 |
11 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
12 (branch merge, don't forget to commit) |
15 (branch merge, don't forget to commit) |
|
16 M b |
|
17 a |
|
18 M b2 |
|
19 R a |
|
20 C c2 |
13 blahblah |
21 blahblah |
14 foo |
|