equal
deleted
inserted
replaced
42 c2 |
42 c2 |
43 b2: remote created -> g |
43 b2: remote created -> g |
44 getting b2 |
44 getting b2 |
45 preserving a for resolve of b |
45 preserving a for resolve of b |
46 removing a |
46 removing a |
47 b: remote moved from a -> m (premerge) |
47 b: remote moved from a -> m |
48 picked tool ':merge' for b (binary False symlink False changedelete False) |
48 picked tool ':merge' for b (binary False symlink False changedelete False) |
49 merging a and b to b |
49 merging a and b to b |
50 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
50 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
51 premerge successful |
51 premerge successful |
52 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
52 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
216 resolving manifests |
216 resolving manifests |
217 branchmerge: True, force: False, partial: False |
217 branchmerge: True, force: False, partial: False |
218 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 |
218 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 |
219 starting 4 threads for background file closing (?) |
219 starting 4 threads for background file closing (?) |
220 preserving z for resolve of z |
220 preserving z for resolve of z |
221 z: both renamed from y -> m (premerge) |
221 z: both renamed from y -> m |
222 picked tool ':merge3' for z (binary False symlink False changedelete False) |
222 picked tool ':merge3' for z (binary False symlink False changedelete False) |
223 merging z |
223 merging z |
224 my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e |
224 my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e |
225 premerge successful |
225 premerge successful |
226 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
226 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |