equal
deleted
inserted
replaced
|
1 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2 resolving manifests |
|
3 overwrite None partial False |
|
4 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 |
|
5 a: remote moved to c -> m |
|
6 a: remote moved to b -> m |
|
7 copying a to b |
|
8 copying a to c |
|
9 merging a and b |
|
10 my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 |
|
11 removing a |
|
12 merging a and c |
|
13 my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 |
|
14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
15 (branch merge, don't forget to commit) |
|
16 -- b -- |
|
17 0 |
|
18 1 |
|
19 2 |
|
20 -- c -- |
|
21 0 |
|
22 1 |
|
23 2 |