33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
33 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
34 preserving a for resolve of b |
34 preserving a for resolve of b |
35 preserving a for resolve of c |
35 preserving a for resolve of c |
36 removing a |
36 removing a |
37 b: remote moved from a -> m |
37 b: remote moved from a -> m |
38 updating: b 1/2 files (50.00%) |
|
39 picked tool 'internal:merge' for b (binary False symlink False) |
38 picked tool 'internal:merge' for b (binary False symlink False) |
40 merging a and b to b |
39 merging a and b to b |
41 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
40 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
42 premerge successful |
41 premerge successful |
43 c: remote moved from a -> m |
42 c: remote moved from a -> m |
44 updating: c 2/2 files (100.00%) |
|
45 picked tool 'internal:merge' for c (binary False symlink False) |
43 picked tool 'internal:merge' for c (binary False symlink False) |
46 merging a and c to c |
44 merging a and c to c |
47 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
45 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
48 premerge successful |
46 premerge successful |
49 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
47 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |