19 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c |
19 ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c |
20 a: remote moved to b -> m |
20 a: remote moved to b -> m |
21 b2: remote created -> g |
21 b2: remote created -> g |
22 preserving a for resolve of b |
22 preserving a for resolve of b |
23 removing a |
23 removing a |
24 update: a 1/3 files (33.33%) |
24 updating: a 1/3 files (33.33%) |
25 picked tool 'internal:merge' for b (binary False symlink False) |
25 picked tool 'internal:merge' for b (binary False symlink False) |
26 merging a and b to b |
26 merging a and b to b |
27 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
27 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
28 premerge successful |
28 premerge successful |
29 update: a2 2/3 files (66.67%) |
29 updating: a2 2/3 files (66.67%) |
30 warning: detected divergent renames of a2 to: |
30 warning: detected divergent renames of a2 to: |
31 c2 |
31 c2 |
32 b2 |
32 b2 |
33 update: b2 3/3 files (100.00%) |
33 updating: b2 3/3 files (100.00%) |
34 getting b2 |
34 getting b2 |
35 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
35 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
36 (branch merge, don't forget to commit) |
36 (branch merge, don't forget to commit) |
37 M b |
37 M b |
38 a |
38 a |