equal
deleted
inserted
replaced
98 src: 'a' -> dst: 'c' * |
98 src: 'a' -> dst: 'c' * |
99 checking for directory renames |
99 checking for directory renames |
100 resolving manifests |
100 resolving manifests |
101 branchmerge: True, force: False, partial: False |
101 branchmerge: True, force: False, partial: False |
102 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
102 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
|
103 starting 4 threads for background file closing (?) |
103 preserving a for resolve of b |
104 preserving a for resolve of b |
104 preserving a for resolve of c |
105 preserving a for resolve of c |
105 removing a |
106 removing a |
106 starting 4 threads for background file closing (?) |
|
107 b: remote moved from a -> m (premerge) |
107 b: remote moved from a -> m (premerge) |
108 picked tool ':merge' for b (binary False symlink False changedelete False) |
108 picked tool ':merge' for b (binary False symlink False changedelete False) |
109 merging a and b to b |
109 merging a and b to b |
110 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
110 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
111 premerge successful |
111 premerge successful |